Move bookmark_pref_names.* into bookmarks namespace.

chrome/browser/ui/cocoa/browser_window_controller_unittest.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 
 #include "base/mac/mac_util.h"
 #import "base/mac/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
@@ skipping 105 matching lines @@
 }
 
 TEST_F(BrowserWindowControllerTest, TestFullScreenWindow) {
   // Confirm that |-createFullscreenWindow| doesn't return nil.
   // See BrowserWindowFullScreenControllerTest for more fullscreen tests.
   EXPECT_TRUE([controller_ createFullscreenWindow]);
 }
 
 TEST_F(BrowserWindowControllerTest, TestNormal) {
   // Force the bookmark bar to be shown.
-  profile()->GetPrefs()->SetBoolean(prefs::kShowBookmarkBar, true);
+  profile()->GetPrefs()->SetBoolean(bookmarks::prefs::kShowBookmarkBar, true);
   [controller_ browserWindow]->BookmarkBarStateChanged(
       BookmarkBar::DONT_ANIMATE_STATE_CHANGE);
 
   // Make sure a normal BrowserWindowController is, uh, normal.
   EXPECT_TRUE([controller_ isTabbedWindow]);
   EXPECT_TRUE([controller_ hasTabStrip]);
   EXPECT_FALSE([controller_ hasTitleBar]);
   EXPECT_TRUE([controller_ isBookmarkBarVisible]);
 
   // And make sure a controller for a pop-up window is not normal.
@@ skipping 66 matching lines @@
 
 TEST_F(BrowserWindowControllerTest, TestTheme) {
   [controller_ userChangedTheme];
 }
 
 TEST_F(BrowserWindowControllerTest, BookmarkBarControllerIndirection) {
   EXPECT_FALSE([controller_ isBookmarkBarVisible]);
 
   // Explicitly show the bar. Can't use chrome::ToggleBookmarkBarWhenVisible()
   // because of the notification issues.
-  profile()->GetPrefs()->SetBoolean(prefs::kShowBookmarkBar, true);
+  profile()->GetPrefs()->SetBoolean(bookmarks::prefs::kShowBookmarkBar, true);
 
   [controller_ browserWindow]->BookmarkBarStateChanged(
       BookmarkBar::DONT_ANIMATE_STATE_CHANGE);
   EXPECT_TRUE([controller_ isBookmarkBarVisible]);
 }
 
 #if 0
 // TODO(jrg): This crashes trying to create the BookmarkBarController, adding
 // an observer to the BookmarkModel.
 TEST_F(BrowserWindowControllerTest, TestIncognitoWidthSpace) {
@@ skipping 214 matching lines @@
   CheckViewPositions(controller_);
 
   // Shrink the infobar to 0px and toolbar to 39px and recheck
   [controller_ resizeView:infobar newHeight:0];
   [controller_ resizeView:toolbar newHeight:39];
   CheckViewPositions(controller_);
 }
 
 TEST_F(BrowserWindowControllerTest, TestResizeViewsWithBookmarkBar) {
   // Force a display of the bookmark bar.
-  profile()->GetPrefs()->SetBoolean(prefs::kShowBookmarkBar, true);
+  profile()->GetPrefs()->SetBoolean(bookmarks::prefs::kShowBookmarkBar, true);
   [controller_ browserWindow]->BookmarkBarStateChanged(
       BookmarkBar::DONT_ANIMATE_STATE_CHANGE);
 
   TabStripView* tabstrip = [controller_ tabStripView];
   NSView* contentView = [[tabstrip window] contentView];
   NSView* toolbar = [controller_ toolbarView];
   NSView* bookmark = [controller_ bookmarkView];
   NSView* infobar = [controller_ infoBarContainerView];
 
   // We need to muck with the views a bit to put us in a consistent state before
@@ skipping 25 matching lines @@
 
   // Expand the toolbar to 64px and recheck
   [controller_ resizeView:toolbar newHeight:64];
   CheckViewPositions(controller_);
 
   // Add a 30px download shelf and recheck
   [controller_ resizeView:download newHeight:30];
   CheckViewPositions(controller_);
 
   // Remove the bookmark bar and recheck
-  profile()->GetPrefs()->SetBoolean(prefs::kShowBookmarkBar, false);
+  profile()->GetPrefs()->SetBoolean(bookmarks::prefs::kShowBookmarkBar, false);
   [controller_ resizeView:bookmark newHeight:0];
   CheckViewPositions(controller_);
 
   // Shrink the infobar to 0px and toolbar to 39px and recheck
   [controller_ resizeView:infobar newHeight:0];
   [controller_ resizeView:toolbar newHeight:39];
   CheckViewPositions(controller_);
 }
 
 // Make sure, by default, the bookmark bar and the toolbar are the same width.
 TEST_F(BrowserWindowControllerTest, BookmarkBarIsSameWidth) {
   // Set the pref to the bookmark bar is visible when the toolbar is
   // first created.
-  profile()->GetPrefs()->SetBoolean(prefs::kShowBookmarkBar, true);
+  profile()->GetPrefs()->SetBoolean(bookmarks::prefs::kShowBookmarkBar, true);
 
   // Make sure the bookmark bar is the same width as the toolbar
   NSView* bookmarkBarView = [controller_ bookmarkView];
   NSView* toolbarView = [controller_ toolbarView];
   EXPECT_EQ([toolbarView frame].size.width,
             [bookmarkBarView frame].size.width);
 }
 
 TEST_F(BrowserWindowControllerTest, TestTopRightForBubble) {
   // The bookmark bubble must be attached to a lit and visible star.
@@ skipping 247 matching lines @@
                              currentProfile:profile()];
 
   EXPECT_TRUE([followingNonSeparator isEnabled]);
   EXPECT_FALSE([signinMenuItem isHidden]);
   EXPECT_TRUE([followingNonSeparator isHidden]);
 }
 
 // Verify that hit testing works correctly when the bookmark bar overlaps
 // web contents.
 TEST_F(BrowserWindowControllerTest, BookmarkBarHitTest) {
-  profile()->GetPrefs()->SetBoolean(prefs::kShowBookmarkBar, true);
+  profile()->GetPrefs()->SetBoolean(bookmarks::prefs::kShowBookmarkBar, true);
   [controller_ browserWindow]->BookmarkBarStateChanged(
       BookmarkBar::DONT_ANIMATE_STATE_CHANGE);
 
   NSView* bookmarkView = [controller_ bookmarkView];
   NSView* contentView = [[controller_ window] contentView];
   NSPoint point = [bookmarkView convertPoint:NSMakePoint(1, 1)
                                       toView:[contentView superview]];
 
   EXPECT_TRUE([[contentView hitTest:point] isDescendantOf:bookmarkView]);
 }
@@ skipping 94 matching lines @@
   testFullscreenWindow_.reset(
       [[NSWindow alloc] initWithContentRect:NSMakeRect(0,0,400,400)
                                   styleMask:NSBorderlessWindowMask
                                     backing:NSBackingStoreBuffered
                                       defer:NO]);
   return testFullscreenWindow_.get();
 }
 @end
 
 /* TODO(???): test other methods of BrowserWindowController */