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

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

Issue 1356933002: make ProxyService::CreateSystemProxyConfigService return scoped_ptrs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: small ios fix 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 1056 matching lines...) Expand 10 before | Expand all | Expand 10 after
1067 network_delegate->set_enable_do_not_track(&enable_do_not_track_); 1067 network_delegate->set_enable_do_not_track(&enable_do_not_track_);
1068 network_delegate->set_force_google_safe_search(&force_google_safesearch_); 1068 network_delegate->set_force_google_safe_search(&force_google_safesearch_);
1069 network_delegate->set_force_youtube_safety_mode(&force_youtube_safety_mode_); 1069 network_delegate->set_force_youtube_safety_mode(&force_youtube_safety_mode_);
1070 1070
1071 // NOTE: Proxy service uses the default io thread network delegate, not the 1071 // NOTE: Proxy service uses the default io thread network delegate, not the
1072 // delegate just created. 1072 // delegate just created.
1073 proxy_service_ = ProxyServiceFactory::CreateProxyService( 1073 proxy_service_ = ProxyServiceFactory::CreateProxyService(
1074 io_thread->net_log(), 1074 io_thread->net_log(),
1075 io_thread_globals->proxy_script_fetcher_context.get(), 1075 io_thread_globals->proxy_script_fetcher_context.get(),
1076 io_thread_globals->system_network_delegate.get(), 1076 io_thread_globals->system_network_delegate.get(),
1077 profile_params_->proxy_config_service.release(), command_line, 1077 profile_params_->proxy_config_service.Pass(), command_line,
1078 quick_check_enabled_.GetValue()); 1078 quick_check_enabled_.GetValue());
1079 transport_security_state_.reset(new net::TransportSecurityState()); 1079 transport_security_state_.reset(new net::TransportSecurityState());
1080 base::SequencedWorkerPool* pool = BrowserThread::GetBlockingPool(); 1080 base::SequencedWorkerPool* pool = BrowserThread::GetBlockingPool();
1081 transport_security_persister_.reset( 1081 transport_security_persister_.reset(
1082 new net::TransportSecurityPersister( 1082 new net::TransportSecurityPersister(
1083 transport_security_state_.get(), 1083 transport_security_state_.get(),
1084 profile_params_->path, 1084 profile_params_->path,
1085 pool->GetSequencedTaskRunnerWithShutdownBehavior( 1085 pool->GetSequencedTaskRunnerWithShutdownBehavior(
1086 pool->GetSequenceToken(), 1086 pool->GetSequenceToken(),
1087 base::SequencedWorkerPool::BLOCK_SHUTDOWN), 1087 base::SequencedWorkerPool::BLOCK_SHUTDOWN),
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
1335 new DevToolsNetworkTransactionFactory( 1335 new DevToolsNetworkTransactionFactory(
1336 network_controller_handle_.GetController(), shared_session), 1336 network_controller_handle_.GetController(), shared_session),
1337 shared_session->net_log(), backend)); 1337 shared_session->net_log(), backend));
1338 } 1338 }
1339 1339
1340 void ProfileIOData::SetCookieSettingsForTesting( 1340 void ProfileIOData::SetCookieSettingsForTesting(
1341 content_settings::CookieSettings* cookie_settings) { 1341 content_settings::CookieSettings* cookie_settings) {
1342 DCHECK(!cookie_settings_.get()); 1342 DCHECK(!cookie_settings_.get());
1343 cookie_settings_ = cookie_settings; 1343 cookie_settings_ = cookie_settings;
1344 } 1344 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698