diff options
Diffstat (limited to 'content/browser/webui')
-rw-r--r-- | content/browser/webui/url_data_manager_backend.cc | 6 | ||||
-rw-r--r-- | content/browser/webui/url_data_manager_backend.h | 3 | ||||
-rw-r--r-- | content/browser/webui/url_data_manager_backend_unittest.cc | 5 |
3 files changed, 7 insertions, 7 deletions
diff --git a/content/browser/webui/url_data_manager_backend.cc b/content/browser/webui/url_data_manager_backend.cc index 3bfb0e7..f7538c8 100644 --- a/content/browser/webui/url_data_manager_backend.cc +++ b/content/browser/webui/url_data_manager_backend.cc @@ -540,15 +540,15 @@ URLDataManagerBackend::~URLDataManagerBackend() { } // static -net::URLRequestJobFactory::ProtocolHandler* +scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> URLDataManagerBackend::CreateProtocolHandler( content::ResourceContext* resource_context, bool is_incognito, AppCacheServiceImpl* appcache_service, ChromeBlobStorageContext* blob_storage_context) { DCHECK(resource_context); - return new ChromeProtocolHandler( - resource_context, is_incognito, appcache_service, blob_storage_context); + return make_scoped_ptr(new ChromeProtocolHandler( + resource_context, is_incognito, appcache_service, blob_storage_context)); } void URLDataManagerBackend::AddDataSource( diff --git a/content/browser/webui/url_data_manager_backend.h b/content/browser/webui/url_data_manager_backend.h index e0af605..6a326a0 100644 --- a/content/browser/webui/url_data_manager_backend.h +++ b/content/browser/webui/url_data_manager_backend.h @@ -11,6 +11,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/memory/scoped_ptr.h" #include "base/supports_user_data.h" #include "content/browser/webui/url_data_manager.h" #include "content/public/browser/url_data_source.h" @@ -43,7 +44,7 @@ class URLDataManagerBackend : public base::SupportsUserData::Data { // Invoked to create the protocol handler for chrome://. |is_incognito| should // be set for incognito profiles. Called on the UI thread. - CONTENT_EXPORT static net::URLRequestJobFactory::ProtocolHandler* + CONTENT_EXPORT static scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> CreateProtocolHandler(content::ResourceContext* resource_context, bool is_incognito, AppCacheServiceImpl* appcache_service, diff --git a/content/browser/webui/url_data_manager_backend_unittest.cc b/content/browser/webui/url_data_manager_backend_unittest.cc index 1030533..9a511f1 100644 --- a/content/browser/webui/url_data_manager_backend_unittest.cc +++ b/content/browser/webui/url_data_manager_backend_unittest.cc @@ -43,9 +43,8 @@ class UrlDataManagerBackendTest : public testing::Test { UrlDataManagerBackendTest() { // URLRequestJobFactory takes ownership of the passed in ProtocolHandler. url_request_job_factory_.SetProtocolHandler( - "chrome", - URLDataManagerBackend::CreateProtocolHandler( - &resource_context_, false, nullptr, nullptr)); + "chrome", URLDataManagerBackend::CreateProtocolHandler( + &resource_context_, false, nullptr, nullptr)); url_request_context_.set_job_factory(&url_request_job_factory_); } |