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

Side by Side Diff: ios/chrome/browser/browser_state/chrome_browser_state_impl.cc

Issue 1742293003: Remove isolated app code from iOS's chrome_browser_state_io_data. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 4 years, 9 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/browser_state/chrome_browser_state_impl.h" 5 #include "ios/chrome/browser/browser_state/chrome_browser_state_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/files/file_util.h" 10 #include "base/files/file_util.h"
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 ProtocolHandlerMap* protocol_handlers, 220 ProtocolHandlerMap* protocol_handlers,
221 URLRequestInterceptorScopedVector request_interceptors) { 221 URLRequestInterceptorScopedVector request_interceptors) {
222 ApplicationContext* application_context = GetApplicationContext(); 222 ApplicationContext* application_context = GetApplicationContext();
223 return io_data_ 223 return io_data_
224 ->CreateMainRequestContextGetter( 224 ->CreateMainRequestContextGetter(
225 protocol_handlers, application_context->GetLocalState(), 225 protocol_handlers, application_context->GetLocalState(),
226 application_context->GetIOSChromeIOThread()) 226 application_context->GetIOSChromeIOThread())
227 .get(); 227 .get();
228 } 228 }
229 229
230 net::URLRequestContextGetter*
231 ChromeBrowserStateImpl::CreateIsolatedRequestContext(
232 const base::FilePath& partition_path) {
233 return io_data_->CreateIsolatedAppRequestContextGetter(partition_path).get();
234 }
235
236 void ChromeBrowserStateImpl::ClearNetworkingHistorySince( 230 void ChromeBrowserStateImpl::ClearNetworkingHistorySince(
237 base::Time time, 231 base::Time time,
238 const base::Closure& completion) { 232 const base::Closure& completion) {
239 io_data_->ClearNetworkingHistorySince(time, completion); 233 io_data_->ClearNetworkingHistorySince(time, completion);
240 } 234 }
241 235
242 PrefProxyConfigTracker* ChromeBrowserStateImpl::GetProxyConfigTracker() { 236 PrefProxyConfigTracker* ChromeBrowserStateImpl::GetProxyConfigTracker() {
243 if (!pref_proxy_config_tracker_) { 237 if (!pref_proxy_config_tracker_) {
244 pref_proxy_config_tracker_ = 238 pref_proxy_config_tracker_ =
245 ios::ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( 239 ios::ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile(
246 GetPrefs(), GetApplicationContext()->GetLocalState()); 240 GetPrefs(), GetApplicationContext()->GetLocalState());
247 } 241 }
248 return pref_proxy_config_tracker_.get(); 242 return pref_proxy_config_tracker_.get();
249 } 243 }
250 244
251 net::SSLConfigService* ChromeBrowserStateImpl::GetSSLConfigService() { 245 net::SSLConfigService* ChromeBrowserStateImpl::GetSSLConfigService() {
252 // If ssl_config_service_manager_ is null, this typically means that some 246 // If ssl_config_service_manager_ is null, this typically means that some
253 // KeyedService is trying to create a RequestContext at startup, 247 // KeyedService is trying to create a RequestContext at startup,
254 // but SSLConfigServiceManager is not initialized until DoFinalInit() which is 248 // but SSLConfigServiceManager is not initialized until DoFinalInit() which is
255 // invoked after all KeyedServices have been initialized (see 249 // invoked after all KeyedServices have been initialized (see
256 // http://crbug.com/171406). 250 // http://crbug.com/171406).
257 DCHECK(ssl_config_service_manager_) 251 DCHECK(ssl_config_service_manager_)
258 << "SSLConfigServiceManager is not initialized yet"; 252 << "SSLConfigServiceManager is not initialized yet";
259 return ssl_config_service_manager_->Get(); 253 return ssl_config_service_manager_->Get();
260 } 254 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698