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

Side by Side Diff: chrome/browser/profiles/profile_io_data.cc

Issue 1290243007: Shift URLRequestContextStorage over to taking scoped_ptrs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@Paul_BuilderGrab
Patch Set: Sync'd to revision p347709. Created 5 years, 3 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 (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_io_data.h" 5 #include "chrome/browser/profiles/profile_io_data.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 1040 matching lines...) Expand 10 before | Expand all | Expand 10 after
1051 #endif 1051 #endif
1052 network_delegate->set_profile(profile_params_->profile); 1052 network_delegate->set_profile(profile_params_->profile);
1053 network_delegate->set_profile_path(profile_params_->path); 1053 network_delegate->set_profile_path(profile_params_->path);
1054 network_delegate->set_cookie_settings(profile_params_->cookie_settings.get()); 1054 network_delegate->set_cookie_settings(profile_params_->cookie_settings.get());
1055 network_delegate->set_enable_do_not_track(&enable_do_not_track_); 1055 network_delegate->set_enable_do_not_track(&enable_do_not_track_);
1056 network_delegate->set_force_google_safe_search(&force_google_safesearch_); 1056 network_delegate->set_force_google_safe_search(&force_google_safesearch_);
1057 network_delegate->set_force_youtube_safety_mode(&force_youtube_safety_mode_); 1057 network_delegate->set_force_youtube_safety_mode(&force_youtube_safety_mode_);
1058 1058
1059 // NOTE: Proxy service uses the default io thread network delegate, not the 1059 // NOTE: Proxy service uses the default io thread network delegate, not the
1060 // delegate just created. 1060 // delegate just created.
1061 proxy_service_.reset( 1061 proxy_service_ = ProxyServiceFactory::CreateProxyService(
1062 ProxyServiceFactory::CreateProxyService( 1062 io_thread->net_log(),
1063 io_thread->net_log(), 1063 io_thread_globals->proxy_script_fetcher_context.get(),
1064 io_thread_globals->proxy_script_fetcher_context.get(), 1064 io_thread_globals->system_network_delegate.get(),
1065 io_thread_globals->system_network_delegate.get(), 1065 profile_params_->proxy_config_service.release(), command_line,
1066 profile_params_->proxy_config_service.release(), 1066 quick_check_enabled_.GetValue());
1067 command_line,
1068 quick_check_enabled_.GetValue()));
1069 transport_security_state_.reset(new net::TransportSecurityState()); 1067 transport_security_state_.reset(new net::TransportSecurityState());
1070 base::SequencedWorkerPool* pool = BrowserThread::GetBlockingPool(); 1068 base::SequencedWorkerPool* pool = BrowserThread::GetBlockingPool();
1071 transport_security_persister_.reset( 1069 transport_security_persister_.reset(
1072 new net::TransportSecurityPersister( 1070 new net::TransportSecurityPersister(
1073 transport_security_state_.get(), 1071 transport_security_state_.get(),
1074 profile_params_->path, 1072 profile_params_->path,
1075 pool->GetSequencedTaskRunnerWithShutdownBehavior( 1073 pool->GetSequencedTaskRunnerWithShutdownBehavior(
1076 pool->GetSequenceToken(), 1074 pool->GetSequenceToken(),
1077 base::SequencedWorkerPool::BLOCK_SHUTDOWN), 1075 base::SequencedWorkerPool::BLOCK_SHUTDOWN),
1078 IsOffTheRecord())); 1076 IsOffTheRecord()));
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
1321 new DevToolsNetworkTransactionFactory( 1319 new DevToolsNetworkTransactionFactory(
1322 network_controller_handle_.GetController(), shared_session), 1320 network_controller_handle_.GetController(), shared_session),
1323 shared_session->net_log(), backend)); 1321 shared_session->net_log(), backend));
1324 } 1322 }
1325 1323
1326 void ProfileIOData::SetCookieSettingsForTesting( 1324 void ProfileIOData::SetCookieSettingsForTesting(
1327 content_settings::CookieSettings* cookie_settings) { 1325 content_settings::CookieSettings* cookie_settings) {
1328 DCHECK(!cookie_settings_.get()); 1326 DCHECK(!cookie_settings_.get());
1329 cookie_settings_ = cookie_settings; 1327 cookie_settings_ = cookie_settings;
1330 } 1328 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698