Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(570)

Unified Diff: net/proxy/proxy_service_mojo.h

Issue 1290243007: Shift URLRequestContextStorage over to taking scoped_ptrs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@Paul_BuilderGrab
Patch Set: Lots of fixes driven by try jobs. Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/proxy/proxy_service_mojo.h
diff --git a/net/proxy/proxy_service_mojo.h b/net/proxy/proxy_service_mojo.h
index 8757421ef6a9e3c2866e37567958c9651ac77050..d6927cae961df7c279fa64e984aa67966acea9bf 100644
--- a/net/proxy/proxy_service_mojo.h
+++ b/net/proxy/proxy_service_mojo.h
@@ -6,6 +6,7 @@
#define NET_PROXY_PROXY_SERVICE_MOJO_H_
#include "base/basictypes.h"
+#include "base/memory/scoped_ptr.h"
namespace net {
namespace interfaces {
@@ -36,7 +37,7 @@ class ProxyService;
// |host_resolver| points to the host resolving dependency the PAC script
// should use for any DNS queries. It must remain valid throughout the
// lifetime of the ProxyService.
-ProxyService* CreateProxyServiceUsingMojoFactory(
+scoped_ptr<ProxyService> CreateProxyServiceUsingMojoFactory(
MojoProxyResolverFactory* mojo_proxy_factory,
ProxyConfigService* proxy_config_service,
ProxyScriptFetcher* proxy_script_fetcher,
@@ -53,7 +54,7 @@ ProxyService* CreateProxyServiceUsingMojoFactory(
// # multi-threading model. In order for this to be safe to use, *ALL* the
// # other V8's running in the process must use v8::Locker.
// ##########################################################################
-ProxyService* CreateProxyServiceUsingMojoInProcess(
+scoped_ptr<ProxyService> CreateProxyServiceUsingMojoInProcess(
ProxyConfigService* proxy_config_service,
ProxyScriptFetcher* proxy_script_fetcher,
DhcpProxyScriptFetcher* dhcp_proxy_script_fetcher,

Powered by Google App Engine
This is Rietveld 408576698