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

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

Issue 8311002: Revert 105669 - Additional infrastructure code supporting the report fraudulent certificate chain... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 2 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/profiles/profile_io_data.h ('k') | net/url_request/url_request_context.h » ('j') | 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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"
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/stl_util.h" 14 #include "base/stl_util.h"
15 #include "base/string_number_conversions.h" 15 #include "base/string_number_conversions.h"
16 #include "base/task.h" 16 #include "base/task.h"
17 #include "chrome/browser/browser_process.h" 17 #include "chrome/browser/browser_process.h"
18 #include "chrome/browser/content_settings/host_content_settings_map.h" 18 #include "chrome/browser/content_settings/host_content_settings_map.h"
19 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" 19 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
20 #include "chrome/browser/extensions/extension_info_map.h" 20 #include "chrome/browser/extensions/extension_info_map.h"
21 #include "chrome/browser/extensions/extension_protocols.h" 21 #include "chrome/browser/extensions/extension_protocols.h"
22 #include "chrome/browser/io_thread.h" 22 #include "chrome/browser/io_thread.h"
23 #include "chrome/browser/media/media_internals.h" 23 #include "chrome/browser/media/media_internals.h"
24 #include "chrome/browser/net/chrome_cookie_notification_details.h" 24 #include "chrome/browser/net/chrome_cookie_notification_details.h"
25 #include "chrome/browser/net/chrome_dns_cert_provenance_checker_factory.h" 25 #include "chrome/browser/net/chrome_dns_cert_provenance_checker_factory.h"
26 #include "chrome/browser/net/chrome_fraudulent_certificate_reporter.h"
27 #include "chrome/browser/net/chrome_net_log.h" 26 #include "chrome/browser/net/chrome_net_log.h"
28 #include "chrome/browser/net/chrome_network_delegate.h" 27 #include "chrome/browser/net/chrome_network_delegate.h"
29 #include "chrome/browser/net/pref_proxy_config_service.h" 28 #include "chrome/browser/net/pref_proxy_config_service.h"
30 #include "chrome/browser/net/proxy_service_factory.h" 29 #include "chrome/browser/net/proxy_service_factory.h"
31 #include "chrome/browser/notifications/desktop_notification_service_factory.h" 30 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
32 #include "chrome/browser/policy/url_blacklist_manager.h" 31 #include "chrome/browser/policy/url_blacklist_manager.h"
33 #include "chrome/browser/prefs/pref_service.h" 32 #include "chrome/browser/prefs/pref_service.h"
34 #include "chrome/browser/profiles/profile.h" 33 #include "chrome/browser/profiles/profile.h"
35 #include "chrome/browser/profiles/profile_manager.h" 34 #include "chrome/browser/profiles/profile_manager.h"
36 #include "chrome/browser/transport_security_persister.h" 35 #include "chrome/browser/transport_security_persister.h"
(...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after
407 network_delegate_.reset(new ChromeNetworkDelegate( 406 network_delegate_.reset(new ChromeNetworkDelegate(
408 io_thread_globals->extension_event_router_forwarder.get(), 407 io_thread_globals->extension_event_router_forwarder.get(),
409 profile_params_->extension_info_map, 408 profile_params_->extension_info_map,
410 url_blacklist_manager_.get(), 409 url_blacklist_manager_.get(),
411 profile_params_->profile, 410 profile_params_->profile,
412 &enable_referrers_)); 411 &enable_referrers_));
413 412
414 dns_cert_checker_.reset( 413 dns_cert_checker_.reset(
415 CreateDnsCertProvenanceChecker(io_thread_globals->dnsrr_resolver.get(), 414 CreateDnsCertProvenanceChecker(io_thread_globals->dnsrr_resolver.get(),
416 main_request_context_)); 415 main_request_context_));
417 fraudulent_certificate_reporter_.reset(
418 new chrome_browser_net::ChromeFraudulentCertificateReporter(
419 main_request_context_));
420 416
421 proxy_service_.reset( 417 proxy_service_.reset(
422 ProxyServiceFactory::CreateProxyService( 418 ProxyServiceFactory::CreateProxyService(
423 io_thread->net_log(), 419 io_thread->net_log(),
424 io_thread_globals->proxy_script_fetcher_context.get(), 420 io_thread_globals->proxy_script_fetcher_context.get(),
425 profile_params_->proxy_config_service.release(), 421 profile_params_->proxy_config_service.release(),
426 command_line)); 422 command_line));
427 423
428 transport_security_state_.reset(new net::TransportSecurityState( 424 transport_security_state_.reset(new net::TransportSecurityState(
429 command_line.GetSwitchValueASCII(switches::kHstsHosts))); 425 command_line.GetSwitchValueASCII(switches::kHstsHosts)));
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
536 bool posted = BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, 532 bool posted = BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
537 new DeleteTask<ProfileIOData>(this)); 533 new DeleteTask<ProfileIOData>(this));
538 if (!posted) 534 if (!posted)
539 delete this; 535 delete this;
540 } 536 }
541 537
542 void ProfileIOData::set_origin_bound_cert_service( 538 void ProfileIOData::set_origin_bound_cert_service(
543 net::OriginBoundCertService* origin_bound_cert_service) const { 539 net::OriginBoundCertService* origin_bound_cert_service) const {
544 origin_bound_cert_service_.reset(origin_bound_cert_service); 540 origin_bound_cert_service_.reset(origin_bound_cert_service);
545 } 541 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_io_data.h ('k') | net/url_request/url_request_context.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698