ios/chrome/browser/browser_state/off_the_record_chrome_browser_state_impl.cc - Issue 2888583002: Move ProxyServiceFactory to components/proxy_service/ios.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ios/chrome/browser/browser_state/off_the_record_chrome_browser_state_impl.cc

Issue 2888583002: Move ProxyServiceFactory to components/proxy_service/ios. (Closed)

Patch Set: 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

« components/proxy_config/ios/DEPS ('K') | « ios/chrome/browser/browser_state/chrome_browser_state_io_data.cc ('k') | ios/chrome/browser/ios_chrome_io_thread.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ios/chrome/browser/browser_state/off_the_record_chrome_browser_state_impl.cc

diff --git a/ios/chrome/browser/browser_state/off_the_record_chrome_browser_state_impl.cc b/ios/chrome/browser/browser_state/off_the_record_chrome_browser_state_impl.cc

index a3ec449ef012a674cb4051ede75d6b8314cef9cd..e9e9dc5007ae7cb989ac5cbf2111b38392265d54 100644

--- a/ios/chrome/browser/browser_state/off_the_record_chrome_browser_state_impl.cc

+++ b/ios/chrome/browser/browser_state/off_the_record_chrome_browser_state_impl.cc

@@ -6,12 +6,12 @@

#include "base/logging.h"

#include "components/keyed_service/ios/browser_state_dependency_manager.h"

+#include "components/proxy_config/ios/proxy_service_factory.h"

#include "components/proxy_config/pref_proxy_config_tracker.h"

#include "components/sync_preferences/pref_service_syncable.h"

#include "components/user_prefs/user_prefs.h"

#include "ios/chrome/browser/application_context.h"

#include "ios/chrome/browser/net/ios_chrome_url_request_context_getter.h"

-#include "ios/chrome/browser/net/proxy_service_factory.h"

#include "ios/web/public/web_thread.h"

OffTheRecordChromeBrowserStateImpl::OffTheRecordChromeBrowserStateImpl(

@@ -78,7 +78,7 @@ PrefProxyConfigTracker*

OffTheRecordChromeBrowserStateImpl::GetProxyConfigTracker() {

if (!pref_proxy_config_tracker_) {

pref_proxy_config_tracker_ =

- ios::ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile(

+ ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile(

GetPrefs(), GetApplicationContext()->GetLocalState());

}

return pref_proxy_config_tracker_.get();