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

Unified Diff: chrome/test/base/testing_profile.cc

Issue 1326353002: Remove dependency of PrefSyncableService on Profile. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pref_model_associator
Patch Set: Move files back to //chrome/browser/prefs & //chrome/test/base Created 5 years, 3 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/base/testing_profile.cc
diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc
index 527305cdb7e3466011a876e61a8f52db3934fe24..e2e94f5a956a5bd23fd74280a9d3f4ecfad50521 100644
--- a/chrome/test/base/testing_profile.cc
+++ b/chrome/test/base/testing_profile.cc
@@ -38,6 +38,7 @@
#include "chrome/browser/profiles/storage_partition_descriptor.h"
#include "chrome/browser/search_engines/template_url_fetcher_factory.h"
#include "chrome/browser/sync/glue/sync_start_util.h"
+#include "chrome/browser/ui/prefs/prefs_tab_helper.h"
#include "chrome/browser/ui/zoom/chrome_zoom_level_prefs.h"
#include "chrome/browser/web_data_service_factory.h"
#include "chrome/common/chrome_constants.h"
@@ -743,7 +744,8 @@ void TestingProfile::CreateIncognitoPrefService() {
DCHECK(!testing_prefs_);
// Simplified version of ProfileImpl::GetOffTheRecordPrefs(). Note this
// leaves testing_prefs_ unset.
- prefs_.reset(original_profile_->prefs_->CreateIncognitoPrefService(NULL));
+ prefs_.reset(original_profile_->prefs_->CreateIncognitoPrefService(
+ NULL, base::Bind(&PrefsTabHelper::InitIncognitoUserPrefStore)));
user_prefs::UserPrefs::Set(this, prefs_.get());
}

Powered by Google App Engine
This is Rietveld 408576698