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

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: Addressed comments. Created 7 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 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 724a728b1493bb5ba811b9e14eb83c9f81ebb372..13fa99f180ca126fc3db9d99cded17feb4f6f548 100644
--- a/chrome/browser/profiles/profile_io_data.h
+++ b/chrome/browser/profiles/profile_io_data.h
@@ -274,10 +274,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.
@@ -298,6 +294,10 @@ class ProfileIOData {
net::NetworkDelegate* network_delegate,
net::FtpTransactionFactory* ftp_transaction_factory) const;
+ // Called during profile destruction but before BrowserontextServices are
+ // destroyed.
+ void ReleaseFromBrowserContextServices(Profile* profile);
+
// Called when the profile is destroyed.
void ShutdownOnUIThread();
@@ -497,7 +497,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)

Powered by Google App Engine
This is Rietveld 408576698