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

Unified 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: put the files in the right .gypi 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/profiles/profile_io_data.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/profiles/profile_io_data.h
diff --git a/chrome/browser/profiles/profile_io_data.h b/chrome/browser/profiles/profile_io_data.h
index 3f9dbafc7af6feff544a813cdbe6fcc61d5cfd6a..a3a55b151623f7a8d2de22f982995963c8490832 100644
--- a/chrome/browser/profiles/profile_io_data.h
+++ b/chrome/browser/profiles/profile_io_data.h
@@ -109,6 +109,9 @@ class ProfileIOData {
net::URLRequestJobFactoryImpl* job_factory,
content::ProtocolHandlerMap* protocol_handlers);
+ // Sets a global CertVerifier to use when initializing all profiles.
+ static void SetCertVerifierForTesting(net::CertVerifier* cert_verifier);
+
// Called by Profile.
content::ResourceContext* GetResourceContext() const;
@@ -550,8 +553,8 @@ class ProfileIOData {
#if defined(OS_CHROMEOS)
// Set to |cert_verifier_| if it references a PolicyCertVerifier. In that
// case, the verifier is owned by |cert_verifier_|. Otherwise, set to NULL.
- mutable policy::PolicyCertVerifier* policy_cert_verifier_;
mutable scoped_ptr<net::CertVerifier> cert_verifier_;
+ mutable policy::PolicyCertVerifier* policy_cert_verifier_;
mutable std::string username_hash_;
mutable bool use_system_key_slot_;
#endif
« no previous file with comments | « no previous file | chrome/browser/profiles/profile_io_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698