diff options
| author | torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-15 10:18:44 +0000 |
|---|---|---|
| committer | torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-15 10:18:44 +0000 |
| commit | d2fad141ca242fa4dc011a2bc8b75b49a8840acc (patch) | |
| tree | 5830c915dc8bada5530d9d6545f3c6c4613255a7 /chrome/test | |
| parent | 28bad33ea09251ddc6477fc77a0065b75eda6c43 (diff) | |
| download | chromium_src-d2fad141ca242fa4dc011a2bc8b75b49a8840acc.zip chromium_src-d2fad141ca242fa4dc011a2bc8b75b49a8840acc.tar.gz chromium_src-d2fad141ca242fa4dc011a2bc8b75b49a8840acc.tar.bz2 | |
Profile shouldn't own background page stuff.
BackgroundContentsService and BackgroundModeManager now have factories
which own them, using Profile as a key. This uses the
ProfileKeyedService infrastructure.
BUG=77155
TEST=existing tests
Review URL: http://codereview.chromium.org/6831016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81723 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/testing_profile.cc | 8 | ||||
| -rw-r--r-- | chrome/test/testing_profile.h | 1 |
2 files changed, 3 insertions, 6 deletions
diff --git a/chrome/test/testing_profile.cc b/chrome/test/testing_profile.cc index cab23da..e829522 100644 --- a/chrome/test/testing_profile.cc +++ b/chrome/test/testing_profile.cc @@ -13,6 +13,7 @@ #include "base/path_service.h" #include "base/string_number_conversions.h" #include "chrome/browser/autocomplete/autocomplete_classifier.h" +#include "chrome/browser/background_contents_service_factory.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/custom_handlers/protocol_handler_registry.h" @@ -179,6 +180,8 @@ TestingProfile::TestingProfile() } // Install profile keyed service factory hooks for dummy/test services + BackgroundContentsServiceFactory::GetInstance()->ForceAssociationBetween( + this, NULL); DesktopNotificationServiceFactory::GetInstance()->set_test_factory( &CreateTestDesktopNotificationService); DesktopNotificationServiceFactory::GetInstance()->ForceAssociationBetween( @@ -699,11 +702,6 @@ NTPResourceCache* TestingProfile::GetNTPResourceCache() { return ntp_resource_cache_.get(); } -BackgroundContentsService* -TestingProfile::GetBackgroundContentsService() const { - return NULL; -} - StatusTray* TestingProfile::GetStatusTray() { return NULL; } diff --git a/chrome/test/testing_profile.h b/chrome/test/testing_profile.h index 8b519d2..b2967f4 100644 --- a/chrome/test/testing_profile.h +++ b/chrome/test/testing_profile.h @@ -247,7 +247,6 @@ class TestingProfile : public Profile { virtual void InitRegisteredProtocolHandlers() {} virtual NTPResourceCache* GetNTPResourceCache(); - virtual BackgroundContentsService* GetBackgroundContentsService() const; virtual StatusTray* GetStatusTray(); virtual FilePath last_selected_directory(); virtual void set_last_selected_directory(const FilePath& path); |