diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-15 14:50:23 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-15 14:50:23 +0000 |
| commit | 44420e6f6127bdcdb2bce51b8d2aaaadb893bc21 (patch) | |
| tree | b6acd2f2bfa62f904910640f3512719e55481e32 /chrome/test/testing_profile.cc | |
| parent | f2aca6d93b9f039f2a794ef1e18c3b93991a20ef (diff) | |
| download | chromium_src-44420e6f6127bdcdb2bce51b8d2aaaadb893bc21.zip chromium_src-44420e6f6127bdcdb2bce51b8d2aaaadb893bc21.tar.gz chromium_src-44420e6f6127bdcdb2bce51b8d2aaaadb893bc21.tar.bz2 | |
Revert 92690 (breaks ChromeOS tests) - Remove more unnecessary ChromeURLRequestContext members.
ProfileIOData is now always deleted on the IO thread. Replaces a use of ChromeURLRequestContextGetter with a ChromeURLDataManagerBackend getter callback. Also gets rid of ExtensionInfoMap from ChromeURLRequestContext by directly passing it into the places that need it. Gets rid of the HTML5 storage objects from ChromeURLRequestContext too.
Adds a workaround for TranslateManager's Profile::GetDefaultRequestContext() use, since after this refactoring (by not requiring ChromeURLRequestContextGetter for ChromeURLDataManagerBackend), it prevents having to initialize the ChromeURLRequestContextGetter in most tests since they don't actually use it. This means |default_request_context_| doesn't always get initialized in BrowserMain(), which causes TranslateManager to crash on startup since it requires |default_request_context_| to be initialized. So we forcibly initialize |default_request_context_| until TranslateManager stops depending on this.
BUG=89396
TEST=none
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=92668
Review URL: http://codereview.chromium.org/7282054
TBR=willchan@chromium.org
Review URL: http://codereview.chromium.org/7386008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92693 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/testing_profile.cc')
| -rw-r--r-- | chrome/test/testing_profile.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/test/testing_profile.cc b/chrome/test/testing_profile.cc index 8433c50..dece6f6 100644 --- a/chrome/test/testing_profile.cc +++ b/chrome/test/testing_profile.cc @@ -765,9 +765,7 @@ PromoCounter* TestingProfile::GetInstantPromoCounter() { ChromeURLDataManager* TestingProfile::GetChromeURLDataManager() { if (!chrome_url_data_manager_.get()) - chrome_url_data_manager_.reset( - new ChromeURLDataManager( - base::Callback<ChromeURLDataManagerBackend*(void)>())); + chrome_url_data_manager_.reset(new ChromeURLDataManager(this)); return chrome_url_data_manager_.get(); } |