From 604361f93d6ef3fd3e0507743d84ccd38784412d Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Wed, 13 Aug 2014 16:16:01 +0800 Subject: [PATCH] Pass ProtocolHandlerScopedVector by value. --- brightray/browser/browser_context.cc | 2 +- brightray/browser/browser_context.h | 2 +- brightray/browser/url_request_context_getter.cc | 2 +- brightray/browser/url_request_context_getter.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/brightray/browser/browser_context.cc b/brightray/browser/browser_context.cc index 308e733d422..0973211e08d 100644 --- a/brightray/browser/browser_context.cc +++ b/brightray/browser/browser_context.cc @@ -123,7 +123,7 @@ scoped_ptr BrowserContext::CreateNetworkDelegate() { scoped_ptr BrowserContext::CreateURLRequestJobFactory( const content::ProtocolHandlerMap& protocol_handlers, - const content::ProtocolHandlerScopedVector& protocol_interceptors) { + content::ProtocolHandlerScopedVector protocol_interceptors) { return scoped_ptr(); } diff --git a/brightray/browser/browser_context.h b/brightray/browser/browser_context.h index 328ca72cf10..879bfd7f42a 100644 --- a/brightray/browser/browser_context.h +++ b/brightray/browser/browser_context.h @@ -51,7 +51,7 @@ class BrowserContext : public content::BrowserContext { // implementation. virtual scoped_ptr CreateURLRequestJobFactory( const content::ProtocolHandlerMap& protocol_handlers, - const content::ProtocolHandlerScopedVector& protocol_interceptors); + content::ProtocolHandlerScopedVector protocol_interceptors); virtual base::FilePath GetPath() const OVERRIDE; diff --git a/brightray/browser/url_request_context_getter.cc b/brightray/browser/url_request_context_getter.cc index 3786ccb7bb9..6a0a90b2432 100644 --- a/brightray/browser/url_request_context_getter.cc +++ b/brightray/browser/url_request_context_getter.cc @@ -153,7 +153,7 @@ net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() { // Give user a chance to create their own job factory. scoped_ptr user_job_factory( - job_factory_factory_.Run(protocol_handlers_, protocol_interceptors_)); + job_factory_factory_.Run(protocol_handlers_, protocol_interceptors_.Pass())); if (user_job_factory) { storage_->set_job_factory(user_job_factory.release()); protocol_handlers_.clear(); diff --git a/brightray/browser/url_request_context_getter.h b/brightray/browser/url_request_context_getter.h index 3f3dfb1d7b4..e043beb4cfc 100644 --- a/brightray/browser/url_request_context_getter.h +++ b/brightray/browser/url_request_context_getter.h @@ -27,7 +27,7 @@ class NetworkDelegate; typedef base::Callback( const content::ProtocolHandlerMap& protocol_handlers, - const content::ProtocolHandlerScopedVector& protocol_interceptors)> URLRequestJobFactoryFactory; + content::ProtocolHandlerScopedVector protocol_interceptors)> URLRequestJobFactoryFactory; class URLRequestContextGetter : public net::URLRequestContextGetter { public: