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

Unified Diff: ios/chrome/browser/ios_chrome_io_thread.mm

Issue 2888583002: Move ProxyServiceFactory to components/proxy_service/ios. (Closed)
Patch Set: Update DEPS. Created 3 years, 7 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: ios/chrome/browser/ios_chrome_io_thread.mm
diff --git a/ios/chrome/browser/ios_chrome_io_thread.mm b/ios/chrome/browser/ios_chrome_io_thread.mm
index 6eb50ac586d14da775656d6b3ea3e33a81bf0a22..8f5eac85380bc548381034dee3dd5339cdfaae67 100644
--- a/ios/chrome/browser/ios_chrome_io_thread.mm
+++ b/ios/chrome/browser/ios_chrome_io_thread.mm
@@ -30,13 +30,13 @@
#include "components/net_log/chrome_net_log.h"
#include "components/network_session_configurator/network_session_configurator.h"
#include "components/prefs/pref_service.h"
+#include "components/proxy_config/ios/proxy_service_factory.h"
#include "components/proxy_config/pref_proxy_config_tracker.h"
#include "components/variations/variations_associated_data.h"
#include "components/version_info/version_info.h"
#include "ios/chrome/browser/chrome_switches.h"
#include "ios/chrome/browser/net/cookie_util.h"
#include "ios/chrome/browser/net/ios_chrome_network_delegate.h"
-#include "ios/chrome/browser/net/proxy_service_factory.h"
#include "ios/chrome/common/channel_info.h"
#include "ios/web/public/user_agent.h"
#include "ios/web/public/web_client.h"
@@ -277,7 +277,7 @@ IOSChromeIOThread::IOSChromeIOThread(PrefService* local_state,
creation_time_(base::TimeTicks::Now()),
weak_factory_(this) {
pref_proxy_config_tracker_ =
- ios::ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState(
+ ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState(
local_state);
IOSChromeNetworkDelegate::InitializePrefsOnUIThread(nullptr, local_state);
ssl_config_service_manager_.reset(
@@ -498,9 +498,8 @@ void IOSChromeIOThread::InitSystemRequestContext() {
// If we're in unit_tests, IOSChromeIOThread may not be run.
if (!web::WebThread::IsMessageLoopValid(web::WebThread::IO))
return;
- system_proxy_config_service_ =
- ios::ProxyServiceFactory::CreateProxyConfigService(
- pref_proxy_config_tracker_.get());
+ system_proxy_config_service_ = ProxyServiceFactory::CreateProxyConfigService(
+ pref_proxy_config_tracker_.get());
system_url_request_context_getter_ = new SystemURLRequestContextGetter(this);
// Safe to post an unretained this pointer, since IOSChromeIOThread is
@@ -516,7 +515,7 @@ void IOSChromeIOThread::InitSystemRequestContextOnIOThread() {
DCHECK(!globals_->system_proxy_service.get());
DCHECK(system_proxy_config_service_.get());
- globals_->system_proxy_service = ios::ProxyServiceFactory::CreateProxyService(
+ globals_->system_proxy_service = ProxyServiceFactory::CreateProxyService(
net_log_, nullptr, globals_->system_network_delegate.get(),
std::move(system_proxy_config_service_), true /* quick_check_enabled */);
« no previous file with comments | « ios/chrome/browser/browser_state/off_the_record_chrome_browser_state_impl.cc ('k') | ios/chrome/browser/net/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698