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

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_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.
 
 #import <Cocoa/Cocoa.h>
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/command_line.h"
 #include "base/mac/mac_util.h"
@@ skipping 21 matching lines @@
 #include "components/bookmarks/browser/bookmark_utils.h"
 #include "components/bookmarks/common/bookmark_pref_names.h"
 #include "components/bookmarks/test/bookmark_test_helpers.h"
 #include "components/syncable_prefs/testing_pref_service_syncable.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #import "testing/gtest_mac.h"
 #include "testing/platform_test.h"
 #import "third_party/ocmock/OCMock/OCMock.h"
 #include "third_party/ocmock/gtest_support.h"
 #include "ui/base/cocoa/animation_utils.h"
+#include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/theme_provider.h"
 #include "ui/events/test/cocoa_test_event_utils.h"
 #include "ui/gfx/image/image_skia.h"
 
 using base::ASCIIToUTF16;
 using bookmarks::BookmarkModel;
 using bookmarks::BookmarkNode;
 
 // Unit tests don't need time-consuming asynchronous animations.
 @interface BookmarkBarControllerTestable : BookmarkBarController {
@@ skipping 955 matching lines @@
 
   const BookmarkNode* parent = model->bookmark_bar_node();
   model->AddURL(parent, parent->child_count(),
                 ASCIIToUTF16("title"), GURL("http://one.com"));
 
   [bar_ loaded:model];
 
   // Make sure the internal bookmark button also is the correct height.
   NSArray* buttons = [bar_ buttons];
   EXPECT_GT([buttons count], 0u);
+  const bool kIsModeMaterial = ui::MaterialDesignController::IsModeMaterial();
+
   for (NSButton* button in buttons) {
-    EXPECT_FLOAT_EQ(
-        (chrome::kBookmarkBarHeight + bookmarks::kVisualHeightOffset) -
-            2 * bookmarks::kBookmarkVerticalPadding,
-        [button frame].size.height);
+    if (kIsModeMaterial) {
+      EXPECT_FLOAT_EQ(
+          (chrome::kBookmarkBarHeight + bookmarks::VisualHeightOffset()) -
+              2 * bookmarks::kMaterialBookmarkVerticalPadding,
+          [button frame].size.height);
+    } else {
+      EXPECT_FLOAT_EQ(
+          (chrome::kBookmarkBarHeight + bookmarks::VisualHeightOffset()) -
+              2 * bookmarks::kBookmarkVerticalPadding,
+          [button frame].size.height);
+    }
   }
 }
 
 TEST_F(BookmarkBarControllerTest, DropBookmarks) {
   const char* urls[] = {
     "http://qwantz.com",
     "http://xkcd.com",
     "javascript:alert('lolwut')",
     "file://localhost/tmp/local-file.txt"  // As if dragged from the desktop.
   };
@@ skipping 555 matching lines @@
                                151.0, 124.0, 123.0 };
   CGFloat* viewWidths = base::mac::IsOSYosemite() ? viewWidthsYosemite :
                                                     viewWidthsRest;
 
   BOOL offTheSideButtonIsHiddenResults[] = { NO, NO, NO, NO, YES, YES, YES, YES,
                                              YES, YES, YES, NO, NO, NO, NO};
   int displayedButtonCountResults[] = { 1, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 2, 2,
                                         2, 1 };
   for (unsigned int i = 0; i < arraysize(viewWidthsYosemite); ++i) {
     NSRect frame = [[bar_ view] frame];
-    frame.size.width = viewWidths[i] + bookmarks::kBookmarkRightMargin;
+    frame.size.width = viewWidths[i] + bookmarks::BookmarkRightMargin();
     [[bar_ view] setFrame:frame];
     EXPECT_EQ(offTheSideButtonIsHiddenResults[i],
               [bar_ offTheSideButtonIsHidden]);
     EXPECT_EQ(displayedButtonCountResults[i], [bar_ displayedButtonCount]);
   }
 }
 
 TEST_F(BookmarkBarControllerTest, BookmarksWithAppsPageShortcut) {
   BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
   const BookmarkNode* root = model->bookmark_bar_node();
@@ skipping 435 matching lines @@
   ASSERT_TRUE([bar_ appsPageShortcutButtonIsHidden]);
 
   // Validate initial model.
   std::string actualModel = bookmarks::test::ModelStringFromNode(root);
   EXPECT_EQ(model_string, actualModel);
 
   // Test a series of points starting at the right edge of the bar.
   BookmarkButton* targetButton = [bar_ buttonWithTitleEqualTo:@"1b"];
   ASSERT_TRUE(targetButton);
   NSPoint targetPoint = [targetButton left];
-  CGFloat leftMarginIndicatorPosition = bookmarks::kBookmarkLeftMargin - 0.5 *
-                                        bookmarks::kBookmarkHorizontalPadding;
+  CGFloat leftMarginIndicatorPosition = bookmarks::BookmarkLeftMargin() - 0.5 *
+                                        bookmarks::BookmarkHorizontalPadding();
   const CGFloat baseOffset = targetPoint.x;
   CGFloat expected = leftMarginIndicatorPosition;
   CGFloat actual = [bar_ indicatorPosForDragToPoint:targetPoint];
   EXPECT_CGFLOAT_EQ(expected, actual);
   targetButton = [bar_ buttonWithTitleEqualTo:@"2f"];
   actual = [bar_ indicatorPosForDragToPoint:[targetButton right]];
   targetButton = [bar_ buttonWithTitleEqualTo:@"3b"];
   expected = [targetButton left].x - baseOffset + leftMarginIndicatorPosition;
   EXPECT_CGFLOAT_EQ(expected, actual);
   targetButton = [bar_ buttonWithTitleEqualTo:@"4b"];
   targetPoint = [targetButton right];
   targetPoint.x += 100;  // Somewhere off to the right.
-  CGFloat xDelta = 0.5 * bookmarks::kBookmarkHorizontalPadding;
+  CGFloat xDelta = 0.5 * bookmarks::BookmarkHorizontalPadding();
   expected = NSMaxX([targetButton frame]) + xDelta;
   actual = [bar_ indicatorPosForDragToPoint:targetPoint];
   EXPECT_CGFLOAT_EQ(expected, actual);
 }
 
 TEST_F(BookmarkBarControllerDragDropTest, PulseButton) {
   BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
   const BookmarkNode* root = model->bookmark_bar_node();
   GURL gurl("http://www.google.com");
   const BookmarkNode* node = model->AddURL(root, root->child_count(),
@@ skipping 63 matching lines @@
                              "2f3b ] 4b ");
   actual = bookmarks::test::ModelStringFromNode(root);
   EXPECT_EQ(expected, actual);
 
   // Verify that the other bookmark folder can't be deleted.
   BookmarkButton *otherButton = [bar_ otherBookmarksButton];
   EXPECT_FALSE([bar_ canDragBookmarkButtonToTrash:otherButton]);
 }
 
 }  // namespace