Revert of [Mac][Material Design] Update bookmarks bar to Material Design.

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_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.
 
 #include <cmath>
 
 #include "base/mac/scoped_nsobject.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h"
@@ skipping 603 matching lines @@
   BookmarkButton* button = [buttons objectAtIndex:3];
   DeleteBookmark(button, profile());
   CGFloat newTop = [menuWindow frame].origin.y + NSHeight([menuWindow frame]);
   EXPECT_CGFLOAT_EQ(oldTop, newTop);
 
   // Scroll so that both the top and bottom scroll arrows show, make sure
   // the top of the window has moved up, then delete a visible button and
   // make sure the top has not moved.
   oldTop = newTop;
   const CGFloat scrollOneBookmark = bookmarks::kBookmarkFolderButtonHeight +
-      bookmarks::BookmarkVerticalPadding();
+      bookmarks::kBookmarkVerticalPadding;
   NSUInteger buttonCounter = 0;
   NSUInteger extraButtonLimit = 3;
   while (![bbfc canScrollDown] || extraButtonLimit > 0) {
     [bbfc performOneScroll:scrollOneBookmark updateMouseSelection:NO];
     ++buttonCounter;
     if ([bbfc canScrollDown])
       --extraButtonLimit;
   }
   newTop = [menuWindow frame].origin.y + NSHeight([menuWindow frame]);
   EXPECT_NE(oldTop, newTop);
@@ skipping 131 matching lines @@
   BookmarkBarFolderController* folderController = [bar_ folderController];
   EXPECT_TRUE(folderController);
   NSWindow* toWindow = [folderController window];
   EXPECT_TRUE(toWindow);
   NSRect oldToWindowFrame = [toWindow frame];
   // Drag a bar button onto a bookmark (i.e. not a folder) in a folder
   // so it should end up below the target bookmark.
   BookmarkButton* draggedButton = [bar_ buttonWithTitleEqualTo:@"1b"];
   ASSERT_TRUE(draggedButton);
   CGFloat horizontalShift =
-      NSWidth([draggedButton frame]) + bookmarks::BookmarkHorizontalPadding();
+      NSWidth([draggedButton frame]) + bookmarks::kBookmarkHorizontalPadding;
   BookmarkButton* targetButton =
       [folderController buttonWithTitleEqualTo:@"2f1b"];
   ASSERT_TRUE(targetButton);
   [folderController dragButton:draggedButton
                             to:[targetButton center]
                           copy:NO];
   // The button should have landed just after "2f1b".
   const std::string expected_string("2f:[ 2f1b 1b 2f2f:[ 2f2f1b "
       "2f2f2b 2f2f3b ] 2f3b ] 3b 4f:[ 4f1f:[ 4f1f1b 4f1f2b 4f1f3b ] 4f2f:[ "
       "4f2f1b 4f2f2b 4f2f3b ] 4f3f:[ 4f3f1b 4f3f2b 4f3f3b ] ] 5b ");
@@ skipping 491 matching lines @@
 
   // Pop open the new folder window and verify it has one (empty) item.
   BookmarkButton* button = [bar_ buttonWithTitleEqualTo:@"BIG"];
   [[button target] performSelector:@selector(openBookmarkFolderFromButton:)
                         withObject:button];
   BookmarkBarFolderController* folderController = [bar_ folderController];
   EXPECT_TRUE(folderController);
   NSWindow* folderWindow = [folderController window];
   EXPECT_TRUE(folderWindow);
   CGFloat expectedHeight = (CGFloat)bookmarks::kBookmarkFolderButtonHeight +
-      (2*bookmarks::BookmarkVerticalPadding());
+      (2*bookmarks::kBookmarkVerticalPadding);
   NSRect windowFrame = [folderWindow frame];
   CGFloat windowHeight = NSHeight(windowFrame);
   EXPECT_CGFLOAT_EQ(expectedHeight, windowHeight);
   EXPECT_FALSE([folderController canScrollUp]);
   EXPECT_FALSE([folderController canScrollDown]);
 
   // Now add a real bookmark and reopen.
   model->AddURL(folder, folder->child_count(), ASCIIToUTF16("a"),
                 GURL("http://a.com/"));
   folderController = [bar_ folderController];
@@ skipping 287 matching lines @@
   EXPECT_EQ(model_string, actual);
 
   // Pop open the folder.
   BookmarkButton* button = [bar_ buttonWithTitleEqualTo:@"2f"];
   [[button target] performSelector:@selector(openBookmarkFolderFromButton:)
                         withObject:button];
   BookmarkBarFolderController* folder = [bar_ folderController];
   EXPECT_TRUE(folder);
 
   // Test a series of points starting at the top of the folder.
-  const CGFloat yOffset = 0.5 * bookmarks::BookmarkVerticalPadding();
+  const CGFloat yOffset = 0.5 * bookmarks::kBookmarkVerticalPadding;
   BookmarkButton* targetButton = [folder buttonWithTitleEqualTo:@"2f1b"];
   ASSERT_TRUE(targetButton);
   NSPoint targetPoint = [targetButton top];
   CGFloat pos = [folder indicatorPosForDragToPoint:targetPoint];
   EXPECT_CGFLOAT_EQ(targetPoint.y + yOffset, pos);
   pos = [folder indicatorPosForDragToPoint:[targetButton bottom]];
   targetButton = [folder buttonWithTitleEqualTo:@"2f2f"];
   EXPECT_CGFLOAT_EQ([targetButton top].y + yOffset, pos);
   pos = [folder indicatorPosForDragToPoint:NSMakePoint(10,0)];
   targetButton = [folder buttonWithTitleEqualTo:@"2f3b"];
@@ skipping 55 matching lines @@
   DeleteBookmark([folder parentButton], profile());
   EXPECT_FALSE([folder folderController]);
 }
 
 // TODO(jrg): draggingEntered: and draggingExited: trigger timers so
 // they are hard to test.  Factor out "fire timers" into routines
 // which can be overridden to fire immediately to make behavior
 // confirmable.
 // There is a similar problem with mouseEnteredButton: and
 // mouseExitedButton:.