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

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

Issue 1301333002: make ProxyService::CreateSystemProxyConfigService return scoped_ptrs NOT FOR REVIEW (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: try merging again... 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 1042 matching lines...) Expand 10 before | Expand all | Expand 10 after
1053 network_delegate->set_enable_do_not_track(&enable_do_not_track_); 1053 network_delegate->set_enable_do_not_track(&enable_do_not_track_);
1054 network_delegate->set_force_google_safe_search(&force_google_safesearch_); 1054 network_delegate->set_force_google_safe_search(&force_google_safesearch_);
1055 network_delegate->set_force_youtube_safety_mode(&force_youtube_safety_mode_); 1055 network_delegate->set_force_youtube_safety_mode(&force_youtube_safety_mode_);
1056 1056
1057 // NOTE: Proxy service uses the default io thread network delegate, not the 1057 // NOTE: Proxy service uses the default io thread network delegate, not the
1058 // delegate just created. 1058 // delegate just created.
1059 proxy_service_ = ProxyServiceFactory::CreateProxyService( 1059 proxy_service_ = ProxyServiceFactory::CreateProxyService(
1060 io_thread->net_log(), 1060 io_thread->net_log(),
1061 io_thread_globals->proxy_script_fetcher_context.get(), 1061 io_thread_globals->proxy_script_fetcher_context.get(),
1062 io_thread_globals->system_network_delegate.get(), 1062 io_thread_globals->system_network_delegate.get(),
1063 profile_params_->proxy_config_service.release(), command_line, 1063 profile_params_->proxy_config_service.Pass(), command_line,
1064 quick_check_enabled_.GetValue()); 1064 quick_check_enabled_.GetValue());
1065 transport_security_state_.reset(new net::TransportSecurityState()); 1065 transport_security_state_.reset(new net::TransportSecurityState());
1066 base::SequencedWorkerPool* pool = BrowserThread::GetBlockingPool(); 1066 base::SequencedWorkerPool* pool = BrowserThread::GetBlockingPool();
1067 transport_security_persister_.reset( 1067 transport_security_persister_.reset(
1068 new net::TransportSecurityPersister( 1068 new net::TransportSecurityPersister(
1069 transport_security_state_.get(), 1069 transport_security_state_.get(),
1070 profile_params_->path, 1070 profile_params_->path,
1071 pool->GetSequencedTaskRunnerWithShutdownBehavior( 1071 pool->GetSequencedTaskRunnerWithShutdownBehavior(
1072 pool->GetSequenceToken(), 1072 pool->GetSequenceToken(),
1073 base::SequencedWorkerPool::BLOCK_SHUTDOWN), 1073 base::SequencedWorkerPool::BLOCK_SHUTDOWN),
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
1324 new DevToolsNetworkTransactionFactory( 1324 new DevToolsNetworkTransactionFactory(
1325 network_controller_handle_.GetController(), shared_session), 1325 network_controller_handle_.GetController(), shared_session),
1326 shared_session->net_log(), backend)); 1326 shared_session->net_log(), backend));
1327 } 1327 }
1328 1328
1329 void ProfileIOData::SetCookieSettingsForTesting( 1329 void ProfileIOData::SetCookieSettingsForTesting(
1330 content_settings::CookieSettings* cookie_settings) { 1330 content_settings::CookieSettings* cookie_settings) {
1331 DCHECK(!cookie_settings_.get()); 1331 DCHECK(!cookie_settings_.get());
1332 cookie_settings_ = cookie_settings; 1332 cookie_settings_ = cookie_settings;
1333 } 1333 }
OLDNEW
« no previous file with comments | « chrome/browser/net/proxy_service_factory.cc ('k') | chrome/service/net/service_url_request_context_getter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698