chrome/browser/ui/webui/options/preferences_browsertest.cc - Issue 12340111: Introduce //components/user_prefs, use to eliminate c/b/prefs dependency in Autofill.

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/ui/webui/options/preferences_browsertest.cc

Issue 12340111: Introduce //components/user_prefs, use to eliminate c/b/prefs dependency in Autofill. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Pure merge of LKGR Created 7 years, 10 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/ui/webui/ntp/suggestions_page_handler.cc ('k') | chrome/browser/ui/webui/plugins_ui.cc » ('j') | components/user_prefs/pref_registry_syncable.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/preferences_browsertest.cc

diff --git a/chrome/browser/ui/webui/options/preferences_browsertest.cc b/chrome/browser/ui/webui/options/preferences_browsertest.cc

index e9aa573abfb8f0a720e52045e25053f3c26ff7fc..5839538d6ca4158a309f7aa0266d1137c006e227 100644

--- a/chrome/browser/ui/webui/options/preferences_browsertest.cc

+++ b/chrome/browser/ui/webui/options/preferences_browsertest.cc

@@ -22,6 +22,7 @@

#include "chrome/common/pref_names.h"

#include "chrome/common/url_constants.h"

#include "chrome/test/base/ui_test_utils.h"

+#include "components/user_prefs/user_prefs.h"

#include "content/public/browser/notification_details.h"

#include "content/public/browser/notification_source.h"

#include "content/public/browser/render_view_host.h"

@@ -81,8 +82,7 @@ void PreferencesBrowserTest::SetUpOnMainThread() {

ASSERT_TRUE(web_contents);

render_view_host_ = web_contents->GetRenderViewHost();

ASSERT_TRUE(render_view_host_);

- pref_change_registrar_.Init(

- PrefServiceFromBrowserContext(browser()->profile()));

+ pref_change_registrar_.Init(components::UserPrefs::Get(browser()->profile()));

pref_service_ = browser()->profile()->GetPrefs();

ASSERT_TRUE(content::ExecuteScript(render_view_host_,

"function TestEnv() {"