summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/extensions')
-rw-r--r--chrome/browser/extensions/api/web_request/web_request_api_unittest.cc5
-rw-r--r--chrome/browser/extensions/extension_resource_protocols.cc4
-rw-r--r--chrome/browser/extensions/extension_resource_protocols.h3
3 files changed, 7 insertions, 5 deletions
diff --git a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc
index 2006e6f..5cfdd3b 100644
--- a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc
+++ b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc
@@ -238,8 +238,9 @@ TEST_F(ExtensionWebRequestTest, BlockingEventPrecedenceRedirect) {
ipc_sender_factory.GetWeakPtr());
net::URLRequestJobFactoryImpl job_factory;
- job_factory.SetProtocolHandler(url::kAboutScheme,
- new about_handler::AboutProtocolHandler());
+ job_factory.SetProtocolHandler(
+ url::kAboutScheme,
+ make_scoped_ptr(new about_handler::AboutProtocolHandler()));
context_->set_job_factory(&job_factory);
GURL redirect_url("about:redirected");
diff --git a/chrome/browser/extensions/extension_resource_protocols.cc b/chrome/browser/extensions/extension_resource_protocols.cc
index c24b53f..d40de60 100644
--- a/chrome/browser/extensions/extension_resource_protocols.cc
+++ b/chrome/browser/extensions/extension_resource_protocols.cc
@@ -94,7 +94,7 @@ ExtensionResourceProtocolHandler::MaybeCreateJob(
} // namespace
-net::URLRequestJobFactory::ProtocolHandler*
+scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
CreateExtensionResourceProtocolHandler() {
- return new ExtensionResourceProtocolHandler();
+ return make_scoped_ptr(new ExtensionResourceProtocolHandler());
}
diff --git a/chrome/browser/extensions/extension_resource_protocols.h b/chrome/browser/extensions/extension_resource_protocols.h
index cf6c1e4..85933a7 100644
--- a/chrome/browser/extensions/extension_resource_protocols.h
+++ b/chrome/browser/extensions/extension_resource_protocols.h
@@ -5,10 +5,11 @@
#ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_RESOURCE_PROTOCOLS_H_
#define CHROME_BROWSER_EXTENSIONS_EXTENSION_RESOURCE_PROTOCOLS_H_
+#include "base/memory/scoped_ptr.h"
#include "net/url_request/url_request_job_factory.h"
// Creates the handlers for the chrome-extension-resource:// scheme.
-net::URLRequestJobFactory::ProtocolHandler*
+scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
CreateExtensionResourceProtocolHandler();
#endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_RESOURCE_PROTOCOLS_H_