OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "chrome/browser/profiles/profile_impl.h" | 5 #include "chrome/browser/profiles/profile_impl.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <utility> | 8 #include <utility> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 901 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
912 prefs_.get(), CreateExtensionPrefStore(this, true))); | 912 prefs_.get(), CreateExtensionPrefStore(this, true))); |
913 } | 913 } |
914 return otr_prefs_.get(); | 914 return otr_prefs_.get(); |
915 } | 915 } |
916 | 916 |
917 net::URLRequestContextGetter* ProfileImpl::CreateRequestContext( | 917 net::URLRequestContextGetter* ProfileImpl::CreateRequestContext( |
918 content::ProtocolHandlerMap* protocol_handlers, | 918 content::ProtocolHandlerMap* protocol_handlers, |
919 content::URLRequestInterceptorScopedVector request_interceptors) { | 919 content::URLRequestInterceptorScopedVector request_interceptors) { |
920 return io_data_.CreateMainRequestContextGetter( | 920 return io_data_.CreateMainRequestContextGetter( |
921 protocol_handlers, std::move(request_interceptors), | 921 protocol_handlers, std::move(request_interceptors), |
922 g_browser_process->local_state(), | |
923 g_browser_process->io_thread()) | 922 g_browser_process->io_thread()) |
924 .get(); | 923 .get(); |
925 } | 924 } |
926 | 925 |
927 net::URLRequestContextGetter* ProfileImpl::GetRequestContext() { | 926 net::URLRequestContextGetter* ProfileImpl::GetRequestContext() { |
928 return GetDefaultStoragePartition(this)->GetURLRequestContext(); | 927 return GetDefaultStoragePartition(this)->GetURLRequestContext(); |
929 } | 928 } |
930 | 929 |
931 net::URLRequestContextGetter* ProfileImpl::GetRequestContextForRenderProcess( | 930 net::URLRequestContextGetter* ProfileImpl::GetRequestContextForRenderProcess( |
932 int renderer_child_id) { | 931 int renderer_child_id) { |
(...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1279 ProfileImpl::CreateDomainReliabilityMonitor(PrefService* local_state) { | 1278 ProfileImpl::CreateDomainReliabilityMonitor(PrefService* local_state) { |
1280 domain_reliability::DomainReliabilityService* service = | 1279 domain_reliability::DomainReliabilityService* service = |
1281 domain_reliability::DomainReliabilityServiceFactory::GetInstance()-> | 1280 domain_reliability::DomainReliabilityServiceFactory::GetInstance()-> |
1282 GetForBrowserContext(this); | 1281 GetForBrowserContext(this); |
1283 if (!service) | 1282 if (!service) |
1284 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>(); | 1283 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>(); |
1285 | 1284 |
1286 return service->CreateMonitor( | 1285 return service->CreateMonitor( |
1287 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); | 1286 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); |
1288 } | 1287 } |
OLD | NEW |