chrome/browser/extensions/test_extension_prefs.cc - Issue 1326353002: Remove dependency of PrefSyncableService on Profile.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/test_extension_prefs.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

« no previous file with comments | « chrome/browser/extensions/external_pref_loader.cc ('k') | chrome/browser/net/pref_proxy_config_tracker_impl_unittest.cc » ('j') | chrome/browser/prefs/chrome_pref_model_associator_client.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/test_extension_prefs.cc

diff --git a/chrome/browser/extensions/test_extension_prefs.cc b/chrome/browser/extensions/test_extension_prefs.cc

index b91899b0dd137ca1ad216b43376bc5a2585ecd0a..17cb7865c9470eda27e8da0e1f0488c15bbe5a43 100644

--- a/chrome/browser/extensions/test_extension_prefs.cc

+++ b/chrome/browser/extensions/test_extension_prefs.cc

@@ -20,6 +20,7 @@

#include "chrome/browser/extensions/test_extension_system.h"

#include "chrome/browser/prefs/pref_service_mock_factory.h"

#include "chrome/browser/prefs/pref_service_syncable.h"

+#include "chrome/browser/ui/prefs/prefs_tab_helper.h"

#include "chrome/common/chrome_constants.h"

#include "components/crx_file/id_util.h"

#include "components/pref_registry/pref_registry_syncable.h"

@@ -198,7 +199,8 @@ void TestExtensionPrefs::AddExtension(Extension* extension) {

PrefService* TestExtensionPrefs::CreateIncognitoPrefService() const {

return pref_service_->CreateIncognitoPrefService(

- new ExtensionPrefStore(extension_pref_value_map_.get(), true));

+ new ExtensionPrefStore(extension_pref_value_map_.get(), true),

+ base::Bind(&PrefsTabHelper::InitIncognitoUserPrefStore));

}

void TestExtensionPrefs::set_extensions_disabled(bool extensions_disabled) {