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

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

Issue 1227943002: Allow browser tests to use a MockCertVerifier (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: move factory-setter to ProfileIOData to work with ChromeOS Created 5 years, 4 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
« no previous file with comments | « no previous file | chrome/browser/profiles/profile_io_data.cc » ('j') | net/cert/cert_verifier.cc » ('J')
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 #ifndef CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ 5 #ifndef CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
6 #define CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ 6 #define CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 } 53 }
54 54
55 namespace extensions { 55 namespace extensions {
56 class ExtensionThrottleManager; 56 class ExtensionThrottleManager;
57 class InfoMap; 57 class InfoMap;
58 } 58 }
59 59
60 namespace net { 60 namespace net {
61 class CertificateReportSender; 61 class CertificateReportSender;
62 class CertVerifier; 62 class CertVerifier;
63 class CertVerifierFactory;
63 class ChannelIDService; 64 class ChannelIDService;
64 class CookieStore; 65 class CookieStore;
65 class FraudulentCertificateReporter; 66 class FraudulentCertificateReporter;
66 class FtpTransactionFactory; 67 class FtpTransactionFactory;
67 class HttpServerProperties; 68 class HttpServerProperties;
68 class HttpTransactionFactory; 69 class HttpTransactionFactory;
69 class ProxyConfigService; 70 class ProxyConfigService;
70 class ProxyService; 71 class ProxyService;
71 class SSLConfigService; 72 class SSLConfigService;
72 class TransportSecurityPersister; 73 class TransportSecurityPersister;
(...skipping 29 matching lines...) Expand all
102 // net::URLRequest. 103 // net::URLRequest.
103 static bool IsHandledURL(const GURL& url); 104 static bool IsHandledURL(const GURL& url);
104 105
105 // Utility to install additional WebUI handlers into the |job_factory|. 106 // Utility to install additional WebUI handlers into the |job_factory|.
106 // Ownership of the handlers is transfered from |protocol_handlers| 107 // Ownership of the handlers is transfered from |protocol_handlers|
107 // to the |job_factory|. 108 // to the |job_factory|.
108 static void InstallProtocolHandlers( 109 static void InstallProtocolHandlers(
109 net::URLRequestJobFactoryImpl* job_factory, 110 net::URLRequestJobFactoryImpl* job_factory,
110 content::ProtocolHandlerMap* protocol_handlers); 111 content::ProtocolHandlerMap* protocol_handlers);
111 112
113 // Sets a global CertVerifierFactory; tests can use this to create
114 // per-profile CertVerifiers.
115 static void SetCertVerifierFactoryForTesting(
116 net::CertVerifierFactory* cert_verifier_factory);
117
112 // Called by Profile. 118 // Called by Profile.
113 content::ResourceContext* GetResourceContext() const; 119 content::ResourceContext* GetResourceContext() const;
114 120
115 // Initializes the ProfileIOData object and primes the RequestContext 121 // Initializes the ProfileIOData object and primes the RequestContext
116 // generation. Must be called prior to any of the Get*() methods other than 122 // generation. Must be called prior to any of the Get*() methods other than
117 // GetResouceContext or GetMetricsEnabledStateOnIOThread. 123 // GetResouceContext or GetMetricsEnabledStateOnIOThread.
118 void Init( 124 void Init(
119 content::ProtocolHandlerMap* protocol_handlers, 125 content::ProtocolHandlerMap* protocol_handlers,
120 content::URLRequestInterceptorScopedVector request_interceptors) const; 126 content::URLRequestInterceptorScopedVector request_interceptors) const;
121 127
(...skipping 422 matching lines...) Expand 10 before | Expand all | Expand 10 after
544 mutable scoped_ptr<net::FraudulentCertificateReporter> 550 mutable scoped_ptr<net::FraudulentCertificateReporter>
545 fraudulent_certificate_reporter_; 551 fraudulent_certificate_reporter_;
546 mutable scoped_ptr<net::ProxyService> proxy_service_; 552 mutable scoped_ptr<net::ProxyService> proxy_service_;
547 mutable scoped_ptr<net::TransportSecurityState> transport_security_state_; 553 mutable scoped_ptr<net::TransportSecurityState> transport_security_state_;
548 mutable scoped_ptr<net::HttpServerProperties> 554 mutable scoped_ptr<net::HttpServerProperties>
549 http_server_properties_; 555 http_server_properties_;
550 #if defined(OS_CHROMEOS) 556 #if defined(OS_CHROMEOS)
551 // Set to |cert_verifier_| if it references a PolicyCertVerifier. In that 557 // Set to |cert_verifier_| if it references a PolicyCertVerifier. In that
552 // case, the verifier is owned by |cert_verifier_|. Otherwise, set to NULL. 558 // case, the verifier is owned by |cert_verifier_|. Otherwise, set to NULL.
553 mutable policy::PolicyCertVerifier* policy_cert_verifier_; 559 mutable policy::PolicyCertVerifier* policy_cert_verifier_;
554 mutable scoped_ptr<net::CertVerifier> cert_verifier_;
555 mutable std::string username_hash_; 560 mutable std::string username_hash_;
556 mutable bool use_system_key_slot_; 561 mutable bool use_system_key_slot_;
557 #endif 562 #endif
563 mutable scoped_ptr<net::CertVerifier> cert_verifier_;
Ryan Sleevi 2015/08/04 08:28:44 Since policy_cert_verifier_ points to this (line 5
estark 2015/08/04 17:44:38 Done.
558 564
559 mutable scoped_ptr<net::TransportSecurityPersister> 565 mutable scoped_ptr<net::TransportSecurityPersister>
560 transport_security_persister_; 566 transport_security_persister_;
561 mutable scoped_ptr<net::CertificateReportSender> certificate_report_sender_; 567 mutable scoped_ptr<net::CertificateReportSender> certificate_report_sender_;
562 568
563 // These are only valid in between LazyInitialize() and their accessor being 569 // These are only valid in between LazyInitialize() and their accessor being
564 // called. 570 // called.
565 mutable scoped_ptr<net::URLRequestContext> main_request_context_; 571 mutable scoped_ptr<net::URLRequestContext> main_request_context_;
566 mutable scoped_ptr<net::URLRequestContext> extensions_request_context_; 572 mutable scoped_ptr<net::URLRequestContext> extensions_request_context_;
567 // One URLRequestContext per isolated app for main and media requests. 573 // One URLRequestContext per isolated app for main and media requests.
(...skipping 27 matching lines...) Expand all
595 601
596 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. 602 // TODO(jhawkins): Remove once crbug.com/102004 is fixed.
597 bool initialized_on_UI_thread_; 603 bool initialized_on_UI_thread_;
598 604
599 const Profile::ProfileType profile_type_; 605 const Profile::ProfileType profile_type_;
600 606
601 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); 607 DISALLOW_COPY_AND_ASSIGN(ProfileIOData);
602 }; 608 };
603 609
604 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ 610 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/profiles/profile_io_data.cc » ('j') | net/cert/cert_verifier.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698