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

Unified Diff: net/proxy/proxy_service_mojo.h

Issue 1273013004: Returning scoped_ptr<> instead of raw pointer in DhcpProxyScriptFetcherFactory::Create (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « net/proxy/proxy_service.cc ('k') | net/proxy/proxy_service_mojo.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..d7faf08400de225e1c5f489041b1ea29e8a06e23 100644
--- a/net/proxy/proxy_service_mojo.h
+++ b/net/proxy/proxy_service_mojo.h
@@ -6,13 +6,14 @@
#define NET_PROXY_PROXY_SERVICE_MOJO_H_
#include "base/basictypes.h"
+#include "base/memory/scoped_ptr.h"
+#include "net/proxy/dhcp_proxy_script_fetcher.h"
namespace net {
namespace interfaces {
class ProxyResolverFactory;
}
-class DhcpProxyScriptFetcher;
class HostResolver;
class MojoProxyResolverFactory;
class NetLog;
@@ -30,8 +31,7 @@ class ProxyService;
// any PAC scripts. The resulting ProxyService will take ownership of it.
//
// |dhcp_proxy_script_fetcher| specifies the dependency to use for attempting
-// to retrieve the most appropriate PAC script configured in DHCP. The
-// resulting ProxyService will take ownership of it.
+// to retrieve the most appropriate PAC script configured in DHCP.
//
// |host_resolver| points to the host resolving dependency the PAC script
// should use for any DNS queries. It must remain valid throughout the
@@ -40,7 +40,7 @@ ProxyService* CreateProxyServiceUsingMojoFactory(
MojoProxyResolverFactory* mojo_proxy_factory,
ProxyConfigService* proxy_config_service,
ProxyScriptFetcher* proxy_script_fetcher,
- DhcpProxyScriptFetcher* dhcp_proxy_script_fetcher,
+ scoped_ptr<DhcpProxyScriptFetcher> dhcp_proxy_script_fetcher,
HostResolver* host_resolver,
NetLog* net_log,
NetworkDelegate* network_delegate);
@@ -56,7 +56,7 @@ ProxyService* CreateProxyServiceUsingMojoFactory(
ProxyService* CreateProxyServiceUsingMojoInProcess(
ProxyConfigService* proxy_config_service,
ProxyScriptFetcher* proxy_script_fetcher,
- DhcpProxyScriptFetcher* dhcp_proxy_script_fetcher,
+ scoped_ptr<DhcpProxyScriptFetcher> dhcp_proxy_script_fetcher,
HostResolver* host_resolver,
NetLog* net_log,
NetworkDelegate* network_delegate);
« no previous file with comments | « net/proxy/proxy_service.cc ('k') | net/proxy/proxy_service_mojo.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698