chrome/browser/policy/policy_browsertest.cc - Issue 490123003: Move bookmark_pref_names.* into bookmarks namespace.

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/policy/policy_browsertest.cc

Issue 490123003: Move bookmark_pref_names.* into bookmarks namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: REBASE Created 6 years, 4 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/policy/managed_bookmarks_policy_handler_unittest.cc ('k') | chrome/browser/prefs/pref_functional_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/policy/policy_browsertest.cc

diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc

index f7b364a4e0720633cf1f9865078cc2beda7a33da..c68741703129f3b275dcf2c5fc555f7e172f627d 100644

--- a/chrome/browser/policy/policy_browsertest.cc

+++ b/chrome/browser/policy/policy_browsertest.cc

@@ -805,8 +805,8 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, BookmarkBarEnabled) {

// Test starts in about:blank.

PrefService* prefs = browser()->profile()->GetPrefs();

- EXPECT_FALSE(prefs->IsManagedPreference(prefs::kShowBookmarkBar));

- EXPECT_FALSE(prefs->GetBoolean(prefs::kShowBookmarkBar));

+ EXPECT_FALSE(prefs->IsManagedPreference(bookmarks::prefs::kShowBookmarkBar));

+ EXPECT_FALSE(prefs->GetBoolean(bookmarks::prefs::kShowBookmarkBar));

EXPECT_EQ(BookmarkBar::HIDDEN, browser()->bookmark_bar_state());

PolicyMap policies;

@@ -816,8 +816,8 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, BookmarkBarEnabled) {

new base::FundamentalValue(true),

NULL);

UpdateProviderPolicy(policies);

- EXPECT_TRUE(prefs->IsManagedPreference(prefs::kShowBookmarkBar));

- EXPECT_TRUE(prefs->GetBoolean(prefs::kShowBookmarkBar));

+ EXPECT_TRUE(prefs->IsManagedPreference(bookmarks::prefs::kShowBookmarkBar));

+ EXPECT_TRUE(prefs->GetBoolean(bookmarks::prefs::kShowBookmarkBar));

EXPECT_EQ(BookmarkBar::SHOW, browser()->bookmark_bar_state());

// The NTP has special handling of the bookmark bar.

@@ -830,15 +830,15 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, BookmarkBarEnabled) {

new base::FundamentalValue(false),

NULL);

UpdateProviderPolicy(policies);

- EXPECT_TRUE(prefs->IsManagedPreference(prefs::kShowBookmarkBar));

- EXPECT_FALSE(prefs->GetBoolean(prefs::kShowBookmarkBar));

+ EXPECT_TRUE(prefs->IsManagedPreference(bookmarks::prefs::kShowBookmarkBar));

+ EXPECT_FALSE(prefs->GetBoolean(bookmarks::prefs::kShowBookmarkBar));

// The bookmark bar is hidden in the NTP when disabled by policy.

EXPECT_EQ(BookmarkBar::HIDDEN, browser()->bookmark_bar_state());

policies.Clear();

UpdateProviderPolicy(policies);

- EXPECT_FALSE(prefs->IsManagedPreference(prefs::kShowBookmarkBar));

- EXPECT_FALSE(prefs->GetBoolean(prefs::kShowBookmarkBar));

+ EXPECT_FALSE(prefs->IsManagedPreference(bookmarks::prefs::kShowBookmarkBar));

+ EXPECT_FALSE(prefs->GetBoolean(bookmarks::prefs::kShowBookmarkBar));

// The bookmark bar is shown detached in the NTP, when disabled by prefs only.

EXPECT_EQ(BookmarkBar::DETACHED, browser()->bookmark_bar_state());

}