summaryrefslogtreecommitdiffstats
path: root/chrome/test/testing_profile.h
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-09 16:24:45 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-09 16:24:45 +0000
commit0983c7a0180c34abe1b0d305797e538c65fce6cc (patch)
tree91f81052ba1657bbe7174609d41271b9630cb0c8 /chrome/test/testing_profile.h
parentbe7f2174ece293c452eb1226c33ea3784c5c7901 (diff)
downloadchromium_src-0983c7a0180c34abe1b0d305797e538c65fce6cc.zip
chromium_src-0983c7a0180c34abe1b0d305797e538c65fce6cc.tar.gz
chromium_src-0983c7a0180c34abe1b0d305797e538c65fce6cc.tar.bz2
Splits ChromeURLDataManager into 2 chunks:
. ChromeURLDataManager is no longer a singleton and is always used on the UI thread. ChromeURLDataManager is now profile specific (you get from the profile). . ChromeURLDataManagerBackend handles the URLRequests and the DataSources. ChromeURLDataManagerBackend is created by ChromeURLRequestContext. All DataSources are now profile specific. There were two that wanted to be global, but have been converted. BUG=52022 71868 TEST=none Review URL: http://codereview.chromium.org/6286131 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74292 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/testing_profile.h')
-rw-r--r--chrome/test/testing_profile.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/test/testing_profile.h b/chrome/test/testing_profile.h
index ee16eb6..c32b44e 100644
--- a/chrome/test/testing_profile.h
+++ b/chrome/test/testing_profile.h
@@ -273,6 +273,7 @@ class TestingProfile : public Profile {
virtual ExtensionInfoMap* GetExtensionInfoMap();
virtual PromoCounter* GetInstantPromoCounter();
virtual policy::ProfilePolicyContext* GetPolicyContext();
+ virtual ChromeURLDataManager* GetChromeURLDataManager();
virtual PrerenderManager* GetPrerenderManager();
virtual PrefService* GetOffTheRecordPrefs();
@@ -381,6 +382,8 @@ class TestingProfile : public Profile {
// We use a temporary directory to store testing profile data.
ScopedTempDir temp_dir_;
+
+ scoped_ptr<ChromeURLDataManager> chrome_url_data_manager_;
};
// A profile that derives from another profile. This does not actually