diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-09 21:59:32 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-09 21:59:32 +0000 |
| commit | f37bff408d28bb87f74ebb1907cb4727ae22329e (patch) | |
| tree | 38d35c642704dfa79b6e0b2fc1abbc28570a4b33 /chrome/test/testing_profile.h | |
| parent | 4f61e0e76ac6a0fb034cfd0973d06e5216ada7fc (diff) | |
| download | chromium_src-f37bff408d28bb87f74ebb1907cb4727ae22329e.zip chromium_src-f37bff408d28bb87f74ebb1907cb4727ae22329e.tar.gz chromium_src-f37bff408d28bb87f74ebb1907cb4727ae22329e.tar.bz2 | |
Attempt 2 at: 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.
This differs from the version I landed in that there is now a NULL
check in ChromeURLDataManager::DeleteDataSources.
BUG=52022 71868
TEST=none
TBR=willchan, evan, ahendrickson
Review URL: http://codereview.chromium.org/6462036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74340 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/testing_profile.h')
| -rw-r--r-- | chrome/test/testing_profile.h | 3 |
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 |