| Index: chrome/browser/profiles/profile_impl.cc
|
| diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
|
| index 5569ad707130859af0d57d6e5a42e3765087aae6..022ab422515acdb95167eaec34c391258968ff08 100644
|
| --- a/chrome/browser/profiles/profile_impl.cc
|
| +++ b/chrome/browser/profiles/profile_impl.cc
|
| @@ -913,15 +913,6 @@ PrefService* ProfileImpl::GetOffTheRecordPrefs() {
|
| return otr_prefs_.get();
|
| }
|
|
|
| -net::URLRequestContextGetter* ProfileImpl::CreateRequestContext(
|
| - content::ProtocolHandlerMap* protocol_handlers,
|
| - content::URLRequestInterceptorScopedVector request_interceptors) {
|
| - return io_data_.CreateMainRequestContextGetter(
|
| - protocol_handlers, std::move(request_interceptors),
|
| - g_browser_process->io_thread())
|
| - .get();
|
| -}
|
| -
|
| net::URLRequestContextGetter* ProfileImpl::GetRequestContext() {
|
| return GetDefaultStoragePartition(this)->GetURLRequestContext();
|
| }
|
| @@ -957,18 +948,6 @@ net::URLRequestContextGetter* ProfileImpl::GetRequestContextForExtensions() {
|
| return io_data_.GetExtensionsRequestContextGetter().get();
|
| }
|
|
|
| -net::URLRequestContextGetter*
|
| -ProfileImpl::CreateRequestContextForStoragePartition(
|
| - const base::FilePath& partition_path,
|
| - bool in_memory,
|
| - content::ProtocolHandlerMap* protocol_handlers,
|
| - content::URLRequestInterceptorScopedVector request_interceptors) {
|
| - return io_data_.CreateIsolatedAppRequestContextGetter(
|
| - partition_path, in_memory, protocol_handlers,
|
| - std::move(request_interceptors))
|
| - .get();
|
| -}
|
| -
|
| net::SSLConfigService* ProfileImpl::GetSSLConfigService() {
|
| // If ssl_config_service_manager_ is null, this typically means that some
|
| // KeyedService is trying to create a RequestContext at startup,
|
| @@ -1019,6 +998,27 @@ content::BackgroundSyncController* ProfileImpl::GetBackgroundSyncController() {
|
| return BackgroundSyncControllerFactory::GetForProfile(this);
|
| }
|
|
|
| +net::URLRequestContextGetter* ProfileImpl::CreateRequestContext(
|
| + content::ProtocolHandlerMap* protocol_handlers,
|
| + content::URLRequestInterceptorScopedVector request_interceptors) {
|
| + return io_data_.CreateMainRequestContextGetter(
|
| + protocol_handlers, std::move(request_interceptors),
|
| + g_browser_process->io_thread())
|
| + .get();
|
| +}
|
| +
|
| +net::URLRequestContextGetter*
|
| +ProfileImpl::CreateRequestContextForStoragePartition(
|
| + const base::FilePath& partition_path,
|
| + bool in_memory,
|
| + content::ProtocolHandlerMap* protocol_handlers,
|
| + content::URLRequestInterceptorScopedVector request_interceptors) {
|
| + return io_data_.CreateIsolatedAppRequestContextGetter(
|
| + partition_path, in_memory, protocol_handlers,
|
| + std::move(request_interceptors))
|
| + .get();
|
| +}
|
| +
|
| bool ProfileImpl::IsSameProfile(Profile* profile) {
|
| if (profile == static_cast<Profile*>(this))
|
| return true;
|
|
|