Revert of [Mac][Material Design] Bring bookmark hover state, etc. up to spec.

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

Index: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm
index ff6ba4b43f9382b4fc790246c3eea4528e3776e8..a074dc20bd6c36fbf210c556f1fe7bfc1a6f88ca 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm
@@ -1284,10 +1284,8 @@
   EXPECT_TRUE(folderController);
   NSWindow* folderWindow = [folderController window];
   EXPECT_TRUE(folderWindow);
-  CGFloat expectedHeight =
-      (CGFloat)bookmarks::kBookmarkFolderButtonHeight +
-      bookmarks::BookmarkTopVerticalPadding() +
-      bookmarks::BookmarkBottomVerticalPadding();
+  CGFloat expectedHeight = (CGFloat)bookmarks::kBookmarkFolderButtonHeight +
+      (2*bookmarks::BookmarkVerticalPadding());
   NSRect windowFrame = [folderWindow frame];
   CGFloat windowHeight = NSHeight(windowFrame);
   EXPECT_CGFLOAT_EQ(expectedHeight, windowHeight);
@@ -1595,20 +1593,18 @@
   EXPECT_TRUE(folder);
 
   // Test a series of points starting at the top of the folder.
-  const CGFloat yTopOffset = 0.5 * bookmarks::BookmarkTopVerticalPadding();
-  const CGFloat yBottomOffset =
-      0.5 * bookmarks::BookmarkBottomVerticalPadding();
+  const CGFloat yOffset = 0.5 * bookmarks::BookmarkVerticalPadding();
   BookmarkButton* targetButton = [folder buttonWithTitleEqualTo:@"2f1b"];
   ASSERT_TRUE(targetButton);
   NSPoint targetPoint = [targetButton top];
   CGFloat pos = [folder indicatorPosForDragToPoint:targetPoint];
-  EXPECT_CGFLOAT_EQ(targetPoint.y + yTopOffset, pos);
+  EXPECT_CGFLOAT_EQ(targetPoint.y + yOffset, pos);
   pos = [folder indicatorPosForDragToPoint:[targetButton bottom]];
   targetButton = [folder buttonWithTitleEqualTo:@"2f2f"];
-  EXPECT_CGFLOAT_EQ([targetButton top].y + yTopOffset, pos);
+  EXPECT_CGFLOAT_EQ([targetButton top].y + yOffset, pos);
   pos = [folder indicatorPosForDragToPoint:NSMakePoint(10,0)];
   targetButton = [folder buttonWithTitleEqualTo:@"2f3b"];
-  EXPECT_CGFLOAT_EQ([targetButton bottom].y - yBottomOffset, pos);
+  EXPECT_CGFLOAT_EQ([targetButton bottom].y - yOffset, pos);
 }
 
 @interface BookmarkBarControllerNoDelete : BookmarkBarController