| Index: chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc
|
| diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc
|
| index be0f28c20ba73c1d4474510bbd9408c595ff3f11..cb184ae8fd2e1e1b651e3c7b0ffa57be7ad9f3ff 100644
|
| --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc
|
| +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc
|
| @@ -59,13 +59,13 @@ TEST_F(BookmarkBarViewInstantExtendedTest, AppsShortcutVisibility) {
|
| BookmarkBarView bookmark_bar_view(browser(), NULL);
|
| bookmark_bar_view.set_owned_by_client();
|
| browser()->profile()->GetPrefs()->SetBoolean(
|
| - prefs::kShowAppsShortcutInBookmarkBar, false);
|
| + bookmarks::prefs::kShowAppsShortcutInBookmarkBar, false);
|
| EXPECT_FALSE(bookmark_bar_view.apps_page_shortcut_->visible());
|
|
|
| // Try to make the Apps shortcut visible. Its visibility depends on whether
|
| // the app launcher is enabled.
|
| browser()->profile()->GetPrefs()->SetBoolean(
|
| - prefs::kShowAppsShortcutInBookmarkBar, true);
|
| + bookmarks::prefs::kShowAppsShortcutInBookmarkBar, true);
|
| if (IsAppLauncherEnabled()) {
|
| EXPECT_FALSE(bookmark_bar_view.apps_page_shortcut_->visible());
|
| } else {
|
| @@ -74,7 +74,7 @@ TEST_F(BookmarkBarViewInstantExtendedTest, AppsShortcutVisibility) {
|
|
|
| // Make sure we can also properly transition from true to false.
|
| browser()->profile()->GetPrefs()->SetBoolean(
|
| - prefs::kShowAppsShortcutInBookmarkBar, false);
|
| + bookmarks::prefs::kShowAppsShortcutInBookmarkBar, false);
|
| EXPECT_FALSE(bookmark_bar_view.apps_page_shortcut_->visible());
|
| }
|
|
|
| @@ -93,17 +93,17 @@ TEST_F(BookmarkBarViewTest, ManagedShowAppsShortcutInBookmarksBar) {
|
|
|
| // By default, the pref is not managed and the apps shortcut is shown.
|
| TestingPrefServiceSyncable* prefs = profile()->GetTestingPrefService();
|
| - EXPECT_FALSE(
|
| - prefs->IsManagedPreference(prefs::kShowAppsShortcutInBookmarkBar));
|
| + EXPECT_FALSE(prefs->IsManagedPreference(
|
| + bookmarks::prefs::kShowAppsShortcutInBookmarkBar));
|
| EXPECT_TRUE(bookmark_bar_view.apps_page_shortcut_->visible());
|
|
|
| // Hide the apps shortcut by policy, via the managed pref.
|
| - prefs->SetManagedPref(prefs::kShowAppsShortcutInBookmarkBar,
|
| + prefs->SetManagedPref(bookmarks::prefs::kShowAppsShortcutInBookmarkBar,
|
| new base::FundamentalValue(false));
|
| EXPECT_FALSE(bookmark_bar_view.apps_page_shortcut_->visible());
|
|
|
| // And try showing it via policy too.
|
| - prefs->SetManagedPref(prefs::kShowAppsShortcutInBookmarkBar,
|
| + prefs->SetManagedPref(bookmarks::prefs::kShowAppsShortcutInBookmarkBar,
|
| new base::FundamentalValue(true));
|
| EXPECT_TRUE(bookmark_bar_view.apps_page_shortcut_->visible());
|
| }
|
|
|