Move bookmark_pref_names.* into bookmarks namespace.

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm

Index: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
index 598bf5bc47a065971bc67e469bd74efbb71ddeb5..bac815687de944e72914cb7b97665d9d6839c042 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
@@ -1534,8 +1534,8 @@ TEST_F(BookmarkBarControllerTest, ShrinkOrHideView) {
 
 TEST_F(BookmarkBarControllerTest, LastBookmarkResizeBehavior) {
   // Hide the apps shortcut.
-  profile()->GetPrefs()->SetBoolean(prefs::kShowAppsShortcutInBookmarkBar,
-                                    false);
+  profile()->GetPrefs()->SetBoolean(
+      bookmarks::prefs::kShowAppsShortcutInBookmarkBar, false);
   ASSERT_TRUE([bar_ appsPageShortcutButtonIsHidden]);
 
   BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
@@ -1583,8 +1583,8 @@ TEST_F(BookmarkBarControllerTest, BookmarksWithAppsPageShortcut) {
   }
 
   // Removing the Apps button should move every bookmark to the left.
-  profile()->GetPrefs()->SetBoolean(prefs::kShowAppsShortcutInBookmarkBar,
-                                    false);
+  profile()->GetPrefs()->SetBoolean(
+      bookmarks::prefs::kShowAppsShortcutInBookmarkBar, false);
   ASSERT_TRUE([bar_ appsPageShortcutButtonIsHidden]);
   EXPECT_GT(apps_button_right, NSMinX([[buttons objectAtIndex:0] frame]));
   for (size_t i = 1; i < [buttons count]; ++i) {
@@ -1603,8 +1603,8 @@ TEST_F(BookmarkBarControllerTest, BookmarksWithoutAppsPageShortcut) {
             NSMinX([[[bar_ buttonView] importBookmarksButton] frame]));
 
   // Removing the Apps button should move the no item containers to the left.
-  profile()->GetPrefs()->SetBoolean(prefs::kShowAppsShortcutInBookmarkBar,
-                                    false);
+  profile()->GetPrefs()->SetBoolean(
+      bookmarks::prefs::kShowAppsShortcutInBookmarkBar, false);
   ASSERT_TRUE([bar_ appsPageShortcutButtonIsHidden]);
   EXPECT_GT(apps_button_right,
             NSMinX([[[bar_ buttonView] noItemTextfield] frame]));
@@ -1615,17 +1615,17 @@ TEST_F(BookmarkBarControllerTest, BookmarksWithoutAppsPageShortcut) {
 TEST_F(BookmarkBarControllerTest, 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_FALSE([bar_ appsPageShortcutButtonIsHidden]);
 
   // Hide the apps shortcut by policy, via the managed pref.
-  prefs->SetManagedPref(prefs::kShowAppsShortcutInBookmarkBar,
+  prefs->SetManagedPref(bookmarks::prefs::kShowAppsShortcutInBookmarkBar,
                         new base::FundamentalValue(false));
   EXPECT_TRUE([bar_ appsPageShortcutButtonIsHidden]);
 
   // And try showing it via policy too.
-  prefs->SetManagedPref(prefs::kShowAppsShortcutInBookmarkBar,
+  prefs->SetManagedPref(bookmarks::prefs::kShowAppsShortcutInBookmarkBar,
                         new base::FundamentalValue(true));
   EXPECT_FALSE([bar_ appsPageShortcutButtonIsHidden]);
 }
@@ -2003,8 +2003,8 @@ TEST_F(BookmarkBarControllerDragDropTest, DropPositionIndicator) {
   test::AddNodesFromModelString(model, root, model_string);
 
   // Hide the apps shortcut.
-  profile()->GetPrefs()->SetBoolean(prefs::kShowAppsShortcutInBookmarkBar,
-                                    false);
+  profile()->GetPrefs()->SetBoolean(
+      bookmarks::prefs::kShowAppsShortcutInBookmarkBar, false);
   ASSERT_TRUE([bar_ appsPageShortcutButtonIsHidden]);
 
   // Validate initial model.