cocoa browser: remove non-MD bookmark bar support

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

Index: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm
index 6d6ee7fc6a5ed44a85e28be49d9eae006c4fa959..e6502d098289a9cc0903c797264a451fee4a79d9 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm
@@ -625,7 +625,7 @@ int AddLotsOfNodes() {
   // 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) {
@@ -777,7 +777,7 @@ void InstallAndToggleBar(BookmarkBarController* bar) {
   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);
@@ -1290,8 +1290,8 @@ void InstallAndToggleBar(BookmarkBarController* bar) {
   EXPECT_TRUE(folderWindow);
   CGFloat expectedHeight =
       (CGFloat)bookmarks::kBookmarkFolderButtonHeight +
-      bookmarks::BookmarkTopVerticalPadding() +
-      bookmarks::BookmarkBottomVerticalPadding();
+      bookmarks::kBookmarkTopVerticalPadding +
+      bookmarks::kBookmarkBottomVerticalPadding;
   NSRect windowFrame = [folderWindow frame];
   CGFloat windowHeight = NSHeight(windowFrame);
   EXPECT_CGFLOAT_EQ(expectedHeight, windowHeight);
@@ -1322,11 +1322,7 @@ void InstallAndToggleBar(BookmarkBarController* bar) {
   EXPECT_CGFLOAT_EQ(scrollerWidth, buttonWidth);
   CGFloat visibleWidth = NSWidth(visibleFrame);
   EXPECT_CGFLOAT_EQ(visibleWidth - widthDelta, buttonWidth);
-  if (ui::MaterialDesignController::IsModeMaterial()) {
-    EXPECT_CGFLOAT_EQ(scrollerWidth, NSWidth([folderView frame]));
-  } else {
-    EXPECT_LT(scrollerWidth, NSWidth([folderView frame]));
-  }
+  EXPECT_CGFLOAT_EQ(scrollerWidth, NSWidth([folderView frame]));
 
   // Add a wider bookmark and make sure the button widths match.
   int reallyWideButtonNumber = folder->child_count();
@@ -1603,9 +1599,9 @@ - (void)setDragDataNode:(const BookmarkNode*)node {
   EXPECT_TRUE(folder);
 
   // Test a series of points starting at the top of the folder.
-  const CGFloat yTopOffset = 0.5 * bookmarks::BookmarkTopVerticalPadding();
+  const CGFloat yTopOffset = 0.5 * bookmarks::kBookmarkTopVerticalPadding;
   const CGFloat yBottomOffset =
-      0.5 * bookmarks::BookmarkBottomVerticalPadding();
+      0.5 * bookmarks::kBookmarkBottomVerticalPadding;
   BookmarkButton* targetButton = [folder buttonWithTitleEqualTo:@"2f1b"];
   ASSERT_TRUE(targetButton);
   NSPoint targetPoint = [targetButton top];