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

Side by Side Diff: ios/chrome/browser/net/proxy_service_factory.cc

Issue 1356933002: make ProxyService::CreateSystemProxyConfigService return scoped_ptrs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Mmenke initial review Created 5 years, 3 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ios/chrome/browser/net/proxy_service_factory.h" 5 #include "ios/chrome/browser/net/proxy_service_factory.h"
6 6
7 #include "components/proxy_config/pref_proxy_config_tracker_impl.h" 7 #include "components/proxy_config/pref_proxy_config_tracker_impl.h"
8 #include "ios/web/public/web_thread.h" 8 #include "ios/web/public/web_thread.h"
9 #include "net/proxy/proxy_config_service.h" 9 #include "net/proxy/proxy_config_service.h"
10 #include "net/proxy/proxy_service.h" 10 #include "net/proxy/proxy_service.h"
(...skipping 27 matching lines...) Expand all
38 return make_scoped_ptr(new PrefProxyConfigTrackerImpl( 38 return make_scoped_ptr(new PrefProxyConfigTrackerImpl(
39 local_state_prefs, 39 local_state_prefs,
40 web::WebThread::GetTaskRunnerForThread(web::WebThread::IO))); 40 web::WebThread::GetTaskRunnerForThread(web::WebThread::IO)));
41 } 41 }
42 42
43 // static 43 // static
44 scoped_ptr<net::ProxyService> ProxyServiceFactory::CreateProxyService( 44 scoped_ptr<net::ProxyService> ProxyServiceFactory::CreateProxyService(
45 net::NetLog* net_log, 45 net::NetLog* net_log,
46 net::URLRequestContext* context, 46 net::URLRequestContext* context,
47 net::NetworkDelegate* network_delegate, 47 net::NetworkDelegate* network_delegate,
48 net::ProxyConfigService* proxy_config_service, 48 net::ProxyConfigService* proxy_config_service,
Randy Smith (Not in Mondays) 2015/09/18 20:14:55 Did you look at the call tree leading into this ar
Charlie Harrison 2015/09/21 16:47:04 Actually I think this won't be hard. Will do this.
49 bool quick_check_enabled) { 49 bool quick_check_enabled) {
50 DCHECK_CURRENTLY_ON_WEB_THREAD(web::WebThread::IO); 50 DCHECK_CURRENTLY_ON_WEB_THREAD(web::WebThread::IO);
51 scoped_ptr<net::ProxyService> proxy_service( 51 scoped_ptr<net::ProxyService> proxy_service(
52 net::ProxyService::CreateUsingSystemProxyResolver(proxy_config_service, 0, 52 net::ProxyService::CreateUsingSystemProxyResolver(
53 net_log)); 53 make_scoped_ptr(proxy_config_service), 0, net_log));
54 proxy_service->set_quick_check_enabled(quick_check_enabled); 54 proxy_service->set_quick_check_enabled(quick_check_enabled);
55 return proxy_service.Pass(); 55 return proxy_service.Pass();
56 } 56 }
57 57
58 } // namespace ios 58 } // namespace ios
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698