diff options
author | danno@chromium.org <danno@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-22 13:47:59 +0000 |
---|---|---|
committer | danno@chromium.org <danno@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-22 13:47:59 +0000 |
commit | 2510323ec78d771c9258fa95d8f98b5d18f3efaa (patch) | |
tree | 2bbb6a5c3ebba6adf5f01982c75ba52275aadcc4 /chrome/test/testing_profile.cc | |
parent | 37d5293518a8657af4d79035f7ef2e8c3a8d6b9a (diff) | |
download | chromium_src-2510323ec78d771c9258fa95d8f98b5d18f3efaa.zip chromium_src-2510323ec78d771c9258fa95d8f98b5d18f3efaa.tar.gz chromium_src-2510323ec78d771c9258fa95d8f98b5d18f3efaa.tar.bz2 |
Revert 60169 - Use PrefChangeRegistrar everywhere
BUG=54955
TEST=PrefChangeRegistrarTest.*
Review URL: http://codereview.chromium.org/3304015
TBR=danno@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60170 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/testing_profile.cc')
-rw-r--r-- | chrome/test/testing_profile.cc | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/chrome/test/testing_profile.cc b/chrome/test/testing_profile.cc index d9acdd7..6fd04fc 100644 --- a/chrome/test/testing_profile.cc +++ b/chrome/test/testing_profile.cc @@ -16,7 +16,6 @@ #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/chrome_thread.h" #include "chrome/browser/dom_ui/ntp_resource_cache.h" -#include "chrome/browser/extensions/extensions_service.h" #include "chrome/browser/favicon_service.h" #include "chrome/browser/find_bar_state.h" #include "chrome/browser/geolocation/geolocation_content_settings_map.h" @@ -208,8 +207,6 @@ TestingProfile::~TestingProfile() { if (top_sites_.get()) top_sites_->ClearProfile(); history::TopSites::DeleteTopSites(top_sites_); - if (extensions_service_.get()) - extensions_service_->DestroyingProfile(); } void TestingProfile::CreateFaviconService() { @@ -318,17 +315,6 @@ void TestingProfile::UseThemeProvider(BrowserThemeProvider* theme_provider) { theme_provider_.reset(theme_provider); } -scoped_refptr<ExtensionsService> TestingProfile::CreateExtensionsService( - const CommandLine* command_line, - const FilePath& install_directory) { - extensions_service_ = new ExtensionsService(this, - command_line, - GetPrefs(), - install_directory, - false); - return extensions_service_; -} - FilePath TestingProfile::GetPath() { DCHECK(temp_dir_.IsValid()); // TODO(phajdan.jr): do it better. return temp_dir_.path(); @@ -344,10 +330,6 @@ webkit_database::DatabaseTracker* TestingProfile::GetDatabaseTracker() { return db_tracker_; } -ExtensionsService* TestingProfile::GetExtensionsService() { - return extensions_service_.get(); -} - net::CookieMonster* TestingProfile::GetCookieMonster() { if (!GetRequestContext()) return NULL; |