chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_apitest.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/extensions/api/bookmark_manager_private/bookmark_manager_private_apitest.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/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc ('k') | chrome/browser/extensions/api/bookmarks/bookmarks_api.cc » ('j') | components/user_prefs/pref_registry_syncable.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_apitest.cc

diff --git a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_apitest.cc b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_apitest.cc

index d81ab416b50dc0d0855145b87e76beecaa47b0f5..dcf29f598b69db57bd7ac546a210dad76ad8ad3b 100644

--- a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_apitest.cc

+++ b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_apitest.cc

@@ -14,6 +14,7 @@

#include "chrome/common/chrome_switches.h"

#include "chrome/common/pref_names.h"

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

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

// Times out on win asan, http://crbug.com/166026

#if defined(OS_WIN) && defined(ADDRESS_SANITIZER)

@@ -44,7 +45,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, BookmarkManagerEditDisabled) {

model->AddURL(bar, 1, ASCIIToUTF16("AAA"), GURL("http://aaa.example.com"));

model->AddURL(folder, 0, ASCIIToUTF16("BBB"), GURL("http://bbb.example.com"));

- PrefService* prefs = PrefServiceFromBrowserContext(profile);

+ PrefService* prefs = components::UserPrefs::Get(profile);

prefs->SetBoolean(prefs::kEditBookmarksEnabled, false);

ASSERT_TRUE(RunComponentExtensionTest("bookmark_manager/edit_disabled"))