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

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"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_button_cell.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_unittest_helper.h"
 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #import "chrome/browser/ui/cocoa/view_resizer_pong.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/test/bookmark_test_helpers.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #import "testing/gtest_mac.h"
 #include "testing/platform_test.h"
 #include "ui/base/cocoa/animation_utils.h"
 #include "ui/base/cocoa/cocoa_base_utils.h"
+#include "ui/base/material_design/material_design_controller.h"
 
 using base::ASCIIToUTF16;
 using bookmarks::BookmarkModel;
 using bookmarks::BookmarkNode;
 
 namespace {
 
 const int kLotsOfNodesCount = 150;
 
 // Deletes the bookmark corresponding to |button|.
@@ skipping 1275 matching lines @@
   CGFloat widthDelta = NSWidth(visibleFrame) - NSWidth(scrollFrame);
 
   CGFloat menuHeight = NSHeight(menuFrame);
   EXPECT_CGFLOAT_EQ(expectedHeight, menuHeight);
   CGFloat scrollerWidth = NSWidth(scrollFrame);
   button = [folderController buttonWithTitleEqualTo:@"a"];
   CGFloat buttonWidth = NSWidth([button frame]);
   EXPECT_CGFLOAT_EQ(scrollerWidth, buttonWidth);
   CGFloat visibleWidth = NSWidth(visibleFrame);
   EXPECT_CGFLOAT_EQ(visibleWidth - widthDelta, buttonWidth);
-  EXPECT_LT(scrollerWidth, NSWidth([folderView frame]));
+  if (ui::MaterialDesignController::IsModeMaterial()) {
+    EXPECT_CGFLOAT_EQ(scrollerWidth, NSWidth([folderView frame]));
+  } else {
+    EXPECT_LT(scrollerWidth, NSWidth([folderView frame]));
+  }
 
   // Add a wider bookmark and make sure the button widths match.
   int reallyWideButtonNumber = folder->child_count();
   model->AddURL(folder, reallyWideButtonNumber,
                 ASCIIToUTF16("A really, really, really, really, really, "
                             "really long name"),
                 GURL("http://www.google.com/a"));
   BookmarkButton* bigButton =
       [folderController buttonWithTitleEqualTo:
        @"A really, really, really, really, really, really long name"];
@@ skipping 334 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:.