Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1233)

Unified Diff: chrome/test/testing_profile.cc

Issue 6831016: Profile shouldn't own background page stuff. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/testing_profile.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/testing_profile.cc
diff --git a/chrome/test/testing_profile.cc b/chrome/test/testing_profile.cc
index cab23da9f53d779854510a576988a1c9bc4c7bc8..e8295229b39ef9e555ac05e7a1d4c32236ffee3e 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;
}
« no previous file with comments | « chrome/test/testing_profile.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698