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

Unified Diff: chrome/test/base/testing_profile.h

Issue 10196004: Changed ChromeURLDataManager to a ProfileKeyedService and made a Factory for it. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Made ChromeURLDataManager's destructor virtual Created 8 years, 8 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_browser.gypi ('k') | chrome/test/base/testing_profile.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/base/testing_profile.h
diff --git a/chrome/test/base/testing_profile.h b/chrome/test/base/testing_profile.h
index 44124168f95387abe9b6a604a67698a6ec89f30f..4aa4965b398a46cfd064e1a93546d681591b9a58 100644
--- a/chrome/test/base/testing_profile.h
+++ b/chrome/test/base/testing_profile.h
@@ -243,7 +243,6 @@ class TestingProfile : public Profile {
// history service processes all pending requests.
void BlockUntilHistoryProcessesPendingRequests();
- virtual ChromeURLDataManager* GetChromeURLDataManager() OVERRIDE;
virtual chrome_browser_net::Predictor* GetNetworkPredictor() OVERRIDE;
virtual void ClearNetworkingHistorySince(base::Time time) OVERRIDE;
virtual GURL GetHomePage() OVERRIDE;
@@ -273,6 +272,9 @@ class TestingProfile : public Profile {
// Creates a TestingPrefService and associates it with the TestingProfile.
void CreateTestingPrefService();
+ virtual base::Callback<ChromeURLDataManagerBackend*(void)>
+ GetChromeURLDataManagerBackendGetter() const OVERRIDE;
+
// The favicon service. Only created if CreateFaviconService is invoked.
scoped_ptr<FaviconService> favicon_service_;
@@ -333,8 +335,6 @@ class TestingProfile : public Profile {
// cases.
FilePath profile_path_;
- scoped_ptr<ChromeURLDataManager> chrome_url_data_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.
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | chrome/test/base/testing_profile.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698