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

Unified Diff: chrome/browser/profiles/profile_io_data.h

Issue 24153012: Fix cyclic dependency between ProfilePolicyConnector and PrefService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed. 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 side-by-side diff with in-line comments
Download patch
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 92813c6ea99ab2e7da53c81132e4ef84104886f3..6de4ec3a58a2e9951a4e3194033ab9e21d756d68 100644
--- a/chrome/browser/profiles/profile_io_data.h
+++ b/chrome/browser/profiles/profile_io_data.h
@@ -47,7 +47,6 @@ class InfoMap;
}
namespace net {
-class CertVerifier;
class CookieStore;
class FraudulentCertificateReporter;
class FtpTransactionFactory;
@@ -277,10 +276,6 @@ class ProfileIOData {
scoped_refptr<const ManagedModeURLFilter> managed_mode_url_filter;
#endif
-#if defined(OS_CHROMEOS)
- scoped_ptr<policy::PolicyCertVerifier> cert_verifier;
-#endif
-
// The profile this struct was populated from. It's passed as a void* to
// ensure it's not accidently used on the IO thread. Before using it on the
// UI thread, call ProfileManager::IsValidProfile to ensure it's alive.
@@ -501,7 +496,7 @@ class ProfileIOData {
mutable scoped_ptr<net::HttpServerProperties>
http_server_properties_;
#if defined(OS_CHROMEOS)
- mutable scoped_ptr<net::CertVerifier> cert_verifier_;
+ mutable scoped_ptr<policy::PolicyCertVerifier> cert_verifier_;
#endif
#if defined(ENABLE_NOTIFICATIONS)
« no previous file with comments | « chrome/browser/profiles/off_the_record_profile_io_data.cc ('k') | chrome/browser/profiles/profile_io_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698