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

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

Index: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm
index 80981e69a13c8b7d92c86f13f713c9ee10fbb9c8..349875136e0a8f677676516ce7c86525326b32e4 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm
@@ -121,7 +121,7 @@
 
 NSRect GetFirstButtonFrameForHeight(CGFloat height) {
   CGFloat y = height - bookmarks::kBookmarkFolderButtonHeight -
-      bookmarks::BookmarkVerticalPadding();
+      bookmarks::kBookmarkVerticalPadding;
   return NSMakeRect(0, y, bookmarks::kDefaultBookmarkWidth,
                     bookmarks::kBookmarkFolderButtonHeight);
 }
@@ -356,9 +356,7 @@
 #pragma mark Private Methods
 
 - (BookmarkButtonCell*)cellForBookmarkNode:(const BookmarkNode*)child {
-  NSImage* image = child ? [barController_ faviconForNode:child
-                                            forADarkTheme:NO]
-                         : nil;
+  NSImage* image = child ? [barController_ faviconForNode:child] : nil;
   BookmarkContextMenuCocoaController* menuController =
       [barController_ menuController];
   BookmarkBarFolderButtonCell* cell =
@@ -540,12 +538,12 @@
     newWindowTopLeft.x = [self childFolderWindowLeftForWidth:windowWidth];
     NSPoint topOfWindow = NSMakePoint(0,
                                       NSMaxY([parentButton_ frame]) -
-                                          bookmarks::BookmarkVerticalPadding());
+                                          bookmarks::kBookmarkVerticalPadding);
     topOfWindow = ui::ConvertPointFromWindowToScreen(
         [parentButton_ window],
         [[parentButton_ superview] convertPoint:topOfWindow toView:nil]);
     newWindowTopLeft.y = topOfWindow.y +
-                         2 * bookmarks::BookmarkVerticalPadding();
+                         2 * bookmarks::kBookmarkVerticalPadding;
   }
   return newWindowTopLeft;
 }
@@ -560,7 +558,7 @@
   // This does not take into account any padding which may be required at the
   // top and/or bottom of the window.
   return (buttonCount * bookmarks::kBookmarkFolderButtonHeight) +
-      2 * bookmarks::BookmarkVerticalPadding();
+      2 * bookmarks::kBookmarkVerticalPadding;
 }
 
 - (void)adjustWindowLeft:(CGFloat)windowLeft
@@ -1732,7 +1730,7 @@
         [buttons_ objectAtIndex:static_cast<NSUInteger>(destIndex)];
     DCHECK(button);
     NSRect buttonFrame = [button frame];
-    y = NSMaxY(buttonFrame) + 0.5 * bookmarks::BookmarkVerticalPadding();
+    y = NSMaxY(buttonFrame) + 0.5 * bookmarks::kBookmarkVerticalPadding;
 
     // If it's a drop at the end (past the last button, if there are any) ...
   } else if (destIndex == numButtons) {
@@ -1743,7 +1741,7 @@
           [buttons_ objectAtIndex:static_cast<NSUInteger>(destIndex - 1)];
       DCHECK(button);
       NSRect buttonFrame = [button frame];
-      y = buttonFrame.origin.y - 0.5 * bookmarks::BookmarkVerticalPadding();
+      y = buttonFrame.origin.y - 0.5 * bookmarks::kBookmarkVerticalPadding;
 
     }
   } else {
@@ -1772,9 +1770,7 @@
 - (void)faviconLoadedForNode:(const BookmarkNode*)node {
   for (BookmarkButton* button in buttons_.get()) {
     if ([button bookmarkNode] == node) {
-      BOOL darkTheme = [[button window] hasDarkTheme];
-      [button setImage:[barController_ faviconForNode:node
-                                        forADarkTheme:darkTheme]];
+      [button setImage:[barController_ faviconForNode:node]];
       [button setNeedsDisplay:YES];
       return;
     }