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

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

Issue 57993004: Remove content dependency from TransportSecurityPersister. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: asdf Created 7 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/net/transport_security_persister_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 797 matching lines...) Expand 10 before | Expand all | Expand 10 after
808 proxy_service_.reset( 808 proxy_service_.reset(
809 ProxyServiceFactory::CreateProxyService( 809 ProxyServiceFactory::CreateProxyService(
810 io_thread->net_log(), 810 io_thread->net_log(),
811 io_thread_globals->proxy_script_fetcher_context.get(), 811 io_thread_globals->proxy_script_fetcher_context.get(),
812 io_thread_globals->system_network_delegate.get(), 812 io_thread_globals->system_network_delegate.get(),
813 profile_params_->proxy_config_service.release(), 813 profile_params_->proxy_config_service.release(),
814 command_line)); 814 command_line));
815 815
816 transport_security_state_.reset(new net::TransportSecurityState()); 816 transport_security_state_.reset(new net::TransportSecurityState());
817 transport_security_persister_.reset( 817 transport_security_persister_.reset(
818 new TransportSecurityPersister(transport_security_state_.get(), 818 new TransportSecurityPersister(
819 profile_params_->path, 819 transport_security_state_.get(),
820 is_incognito())); 820 profile_params_->path,
821 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE),
822 is_incognito()));
821 823
822 // Take ownership over these parameters. 824 // Take ownership over these parameters.
823 cookie_settings_ = profile_params_->cookie_settings; 825 cookie_settings_ = profile_params_->cookie_settings;
824 host_content_settings_map_ = profile_params_->host_content_settings_map; 826 host_content_settings_map_ = profile_params_->host_content_settings_map;
825 #if defined(ENABLE_NOTIFICATIONS) 827 #if defined(ENABLE_NOTIFICATIONS)
826 notification_service_ = profile_params_->notification_service; 828 notification_service_ = profile_params_->notification_service;
827 #endif 829 #endif
828 extension_info_map_ = profile_params_->extension_info_map; 830 extension_info_map_ = profile_params_->extension_info_map;
829 831
830 resource_context_->host_resolver_ = io_thread_globals->host_resolver.get(); 832 resource_context_->host_resolver_ = io_thread_globals->host_resolver.get();
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
993 void ProfileIOData::SetCookieSettingsForTesting( 995 void ProfileIOData::SetCookieSettingsForTesting(
994 CookieSettings* cookie_settings) { 996 CookieSettings* cookie_settings) {
995 DCHECK(!cookie_settings_.get()); 997 DCHECK(!cookie_settings_.get());
996 cookie_settings_ = cookie_settings; 998 cookie_settings_ = cookie_settings;
997 } 999 }
998 1000
999 void ProfileIOData::set_signin_names_for_testing( 1001 void ProfileIOData::set_signin_names_for_testing(
1000 SigninNamesOnIOThread* signin_names) { 1002 SigninNamesOnIOThread* signin_names) {
1001 signin_names_.reset(signin_names); 1003 signin_names_.reset(signin_names);
1002 } 1004 }
OLDNEW
« no previous file with comments | « chrome/browser/net/transport_security_persister_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698