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

Unified Diff: chrome/test/testing_profile.cc

Issue 7285014: [wip] Profile: Sketch of a creation system. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 9 years, 5 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
Index: chrome/test/testing_profile.cc
diff --git a/chrome/test/testing_profile.cc b/chrome/test/testing_profile.cc
index 4778a9846be69ec82b22ecd7e033a913230f61f5..3a47753936915d7eb253f0199d4b69c60ff25a76 100644
--- a/chrome/test/testing_profile.cc
+++ b/chrome/test/testing_profile.cc
@@ -13,7 +13,6 @@
#include "base/path_service.h"
#include "base/string_number_conversions.h"
#include "chrome/browser/autocomplete/autocomplete_classifier.h"
-#include "chrome/browser/background/background_contents_service_factory.h"
#include "chrome/browser/bookmarks/bookmark_model.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/content_settings/host_content_settings_map.h"
@@ -38,8 +37,6 @@
#include "chrome/browser/search_engines/template_url_fetcher.h"
#include "chrome/browser/search_engines/template_url_service.h"
#include "chrome/browser/search_engines/template_url_service_factory.h"
-#include "chrome/browser/sessions/session_service_factory.h"
-#include "chrome/browser/sessions/tab_restore_service_factory.h"
#include "chrome/browser/sync/profile_sync_service_mock.h"
#include "chrome/browser/ui/find_bar/find_bar_state.h"
#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
@@ -129,9 +126,7 @@ TestingProfile::TestingProfile()
incognito_(false),
last_session_exited_cleanly_(true),
profile_dependency_manager_(ProfileDependencyManager::GetInstance()) {
-#ifndef NDEBUG
- profile_dependency_manager_->ProfileNowExists(this);
-#endif
+ profile_dependency_manager_->CreateProfileServices(this, true);
if (!temp_dir_.CreateUniqueTempDir()) {
LOG(ERROR) << "Failed to create unique temporary directory.";
@@ -158,13 +153,8 @@ TestingProfile::TestingProfile()
}
// Install profile keyed service factory hooks for dummy/test services
- BackgroundContentsServiceFactory::GetInstance()->SetTestingFactory(
- this, NULL);
DesktopNotificationServiceFactory::GetInstance()->SetTestingFactory(
this, CreateTestDesktopNotificationService);
- SessionServiceFactory::GetInstance()->SetTestingFactory(this, NULL);
- TabRestoreServiceFactory::GetInstance()->SetTestingFactory(this, NULL);
- TemplateURLServiceFactory::GetInstance()->SetTestingFactory(this, NULL);
NotificationService::current()->Notify(
chrome::NOTIFICATION_PROFILE_CREATED,

Powered by Google App Engine
This is Rietveld 408576698