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

Unified Diff: chrome/test/testing_profile.h

Issue 6766004: Create a ProfileDependencyManager to order ProfileKeyedService destruction. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix improper usage of static_cast<> in existing mac code. Created 9 years, 9 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 | « chrome/chrome_tests.gypi ('k') | chrome/test/testing_profile.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/testing_profile.h
diff --git a/chrome/test/testing_profile.h b/chrome/test/testing_profile.h
index 7ac4651ed84c02e812dcbfd65a8e3d8bbf988522..f241b7ef4ffc11195357feb1d464561fa87b162f 100644
--- a/chrome/test/testing_profile.h
+++ b/chrome/test/testing_profile.h
@@ -35,11 +35,11 @@ class GeolocationPermissionContext;
class HistoryService;
class HostContentSettingsMap;
class PrefService;
+class ProfileDependencyManager;
class ProfileSyncService;
class SessionService;
class TemplateURLModel;
class TestingPrefService;
-class ThemeService;
class URLRequestContextGetter;
class WebKitContext;
@@ -122,6 +122,8 @@ class TestingProfile : public Profile {
TestingPrefService* GetTestingPrefService();
+ void SetProfileDependencyManager(ProfileDependencyManager* manager);
+
virtual ProfileId GetRuntimeId();
virtual FilePath GetPath();
@@ -386,6 +388,11 @@ class TestingProfile : public Profile {
scoped_ptr<ChromeURLDataManager> chrome_url_data_manager_;
scoped_refptr<prerender::PrerenderManager> prerender_manager_;
+
+ // We keep a weak pointer to the dependency manager we want to notify on our
+ // death. Defaults to the Singleton implementation but overridable for
+ // testing.
+ ProfileDependencyManager* profile_dependency_manager_;
};
// A profile that derives from another profile. This does not actually
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | chrome/test/testing_profile.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698