[Mac][Material Design] Adjust bookmark spacing and folder menu drawing.

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

Index: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
index f09e8fc25700e719361f215453e064db29c5137b..92e5da9dae080218c8b95aac23a6182c9dcb5488 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
@@ -269,14 +269,14 @@ CGFloat BookmarkLeftMargin() {
   if (!ui::MaterialDesignController::IsModeMaterial()) {
     return 2.0;
   }
-  return 10.0;
+  return 12.0;
 }
 
 CGFloat BookmarkRightMargin() {
   if (!ui::MaterialDesignController::IsModeMaterial()) {
     return 2.0;
   }
-  return 10.0;
+  return 12.0;
 }
 
 }  // namespace bookmarks
@@ -1239,7 +1239,10 @@ CGFloat BookmarkRightMargin() {
 // too small.  For "FBL" it is 2 pixels too small.
 // For a bookmark named "SFGateFooWoo", it is just fine.
 - (CGFloat)widthForBookmarkButtonCell:(NSCell*)cell {
-  CGFloat desired = [cell cellSize].width + 2;
+  CGFloat desired = [cell cellSize].width;
+  if (!ui::MaterialDesignController::IsModeMaterial()) {
+    desired += 2;
+  }
   return std::min(desired, bookmarks::kDefaultBookmarkWidth);
 }