Reland of [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::kMaterialVisualHeightOffset) -
+                  2 * bookmarks::BookmarkVerticalPadding(),
+          [button frame].size.height);
+    } else {
+      EXPECT_FLOAT_EQ(
+          (chrome::kBookmarkBarHeight + bookmarks::kVisualHeightOffset) -
+              2 * bookmarks::BookmarkVerticalPadding(),
+          [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 524 matching lines @@
   [bar_ shrinkOrHideView:view forMaxX:40.0];
   EXPECT_EQ(40.0, NSWidth([view frame]));
   EXPECT_FALSE([view isHidden]);
   [bar_ shrinkOrHideView:view forMaxX:31.0];
   EXPECT_EQ(31.0, NSWidth([view frame]));
   EXPECT_FALSE([view isHidden]);
   [bar_ shrinkOrHideView:view forMaxX:29.0];
   EXPECT_TRUE([view isHidden]);
 }
 
+// Simiulate browser window width change and ensure that the bookmark buttons
+// that should be visible are visible.
 TEST_F(BookmarkBarControllerTest, LastBookmarkResizeBehavior) {
   // Hide the apps shortcut.
   profile()->GetPrefs()->SetBoolean(
       bookmarks::prefs::kShowAppsShortcutInBookmarkBar, false);
   ASSERT_TRUE([bar_ appsPageShortcutButtonIsHidden]);
 
+  // Add three buttons to the bookmark bar.
   BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
   const BookmarkNode* root = model->bookmark_bar_node();
   const std::string model_string("1b 2f:[ 2f1b 2f2b ] 3b ");
   bookmarks::test::AddNodesFromModelString(model, root, model_string);
   [bar_ frameDidChange];
 
+  // Step through simulated window resizings. In resizing from the first width
+  // to the second, the bookmark bar should transition from displaying one
+  // button to two. Of the next 5 widths, the third transitions the bar from
+  // displaying two buttons to three. The next width (200.0) resizes the bar to
+  // a large width that does not change the number of visible buttons, and the
+  // remaining widths step through all the previous resizings in reverse, which
+  // should correspond to the previous number of visible buttons.
+  //
+  // To recalibrate this test for new OS releases, etc., determine values for
+  // |view_widths[1]| and |view_widths[4]| which will cause a visible button
+  // transition from 1 -> 2 and 2 -> 3, respectively. With those two widths you
+  // can easily compute all widths from 0 through 6. |view_widths[7]| is always
+  // 200.0, and the remainder are the reverse of widths 0 through 6. When all
+  // three buttons are visible, be sure to sanity check with frames (i.e. under
+  // MD the first button should start at x=10, and there should be 16pt of space
+  // between the buttons).
+  //
   // The default font changed between OSX Mavericks, OSX Yosemite, and
   // OSX El Capitan, so this test requires different widths to trigger the
-  // appropriate results. The Mavericks and El Capitan font widths are close
-  // enough to use the same sizes.
-  CGFloat viewWidthsYosemite[] = { 121.0, 122.0, 148.0, 149.0, 150.0, 151.0,
-                                   152.0, 200.0, 152.0, 151.0, 150.0, 149.0,
-                                   148.0, 122.0, 121.0 };
-  CGFloat viewWidthsRest[] = { 123.0, 124.0, 151.0, 152.0, 153.0, 154.0,
-                               155.0, 200.0, 155.0, 154.0, 153.0, 152.0,
-                               151.0, 124.0, 123.0 };
-  CGFloat* viewWidths = base::mac::IsOSYosemite() ? viewWidthsYosemite :
-                                                    viewWidthsRest;
+  // appropriate results. Button widths and locations also changed with
+  // Material Design.
+  CGFloat view_widths_el_capitan[] =
+      { 121.0, 122.0, 149.0, 150.0, 151.0, 152.0,
+        153.0, 200.0, 153.0, 152.0, 151.0, 150.0,
+        149.0, 122.0, 121.0 };
+  CGFloat view_widths_yosemite[] =
+      { 121.0, 122.0, 148.0, 149.0, 150.0, 151.0,
+        152.0, 200.0, 152.0, 151.0, 150.0, 149.0,
+        148.0, 122.0, 121.0 };
+  CGFloat view_widths_rest[] =
+      { 123.0, 124.0, 151.0, 152.0, 153.0, 154.0,
+        155.0, 200.0, 155.0, 154.0, 153.0, 152.0,
+        151.0, 124.0, 123.0 };
+  CGFloat material_view_widths_el_capitan[] =
+      { 139.0, 140.0, 150.0, 151.0, 152.0, 153.0,
+        154.0, 200.0, 154.0, 153.0, 152.0, 151.0,
+        150.0, 140.0, 139.0 };
+  CGFloat material_view_widths_yosemite[] =
+      { 140.0, 141.0, 150.0, 151.0, 152.0, 153.0,
+        154.0, 200.0, 154.0, 153.0, 152.0, 151.0,
+        150.0, 141.0, 140.0 };
+  CGFloat material_view_widths_rest[] =
+      { 142.0, 143.0, 153.0, 154.0, 155.0, 156.0,
+        157.0, 200.0, 157.0, 156.0, 155.0, 154.0,
+        153.0, 143.0, 142.0 };
+  CGFloat* view_widths = NULL;
+  bool is_mode_material = ui::MaterialDesignController::IsModeMaterial();
+  if (base::mac::IsOSElCapitan()) {
+    view_widths = is_mode_material ? material_view_widths_el_capitan
+                                   : view_widths_el_capitan;
+  } else if (base::mac::IsOSYosemite()) {
+    view_widths = is_mode_material ? material_view_widths_yosemite
+                                   : view_widths_yosemite;
+  } else {
+    view_widths = is_mode_material ? material_view_widths_rest
+                                   : view_widths_rest;
+  }
 
-  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) {
+  BOOL off_the_side_button_is_hidden_results[] =
+      { NO, NO, NO, NO, YES, YES, YES, YES, YES, YES, YES, NO, NO, NO, NO};
+  int displayed_button_count_results[] =
+      { 1, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 2, 2, 2, 1 };
+  for (unsigned int i = 0; i < arraysize(view_widths_yosemite); ++i) {
     NSRect frame = [[bar_ view] frame];
-    frame.size.width = viewWidths[i] + bookmarks::kBookmarkRightMargin;
+    frame.size.width = view_widths[i] + bookmarks::BookmarkRightMargin();
     [[bar_ view] setFrame:frame];
-    EXPECT_EQ(offTheSideButtonIsHiddenResults[i],
+    EXPECT_EQ(off_the_side_button_is_hidden_results[i],
               [bar_ offTheSideButtonIsHidden]);
-    EXPECT_EQ(displayedButtonCountResults[i], [bar_ displayedButtonCount]);
+    EXPECT_EQ(displayed_button_count_results[i], [bar_ displayedButtonCount]);
   }
 }
 
 TEST_F(BookmarkBarControllerTest, BookmarksWithAppsPageShortcut) {
   BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
   const BookmarkNode* root = model->bookmark_bar_node();
   const std::string model_string("1b 2f:[ 2f1b 2f2b ] 3b ");
   bookmarks::test::AddNodesFromModelString(model, root, model_string);
   [bar_ frameDidChange];
 
@@ skipping 431 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