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

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"
@@ skipping 1266 matching lines @@
                                                 ASCIIToUTF16("BIG"));
 
   // Pop open the new folder window and verify it has one (empty) item.
   BookmarkButton* button = [bar_ buttonWithTitleEqualTo:@"BIG"];
   [[button target] performSelector:@selector(openBookmarkFolderFromButton:)
                         withObject:button];
   BookmarkBarFolderController* folderController = [bar_ folderController];
   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);
   EXPECT_FALSE([folderController canScrollUp]);
   EXPECT_FALSE([folderController canScrollDown]);
 
   // Now add a real bookmark and reopen.
   model->AddURL(folder, folder->child_count(), ASCIIToUTF16("a"),
                 GURL("http://a.com/"));
   folderController = [bar_ folderController];
@@ skipping 287 matching lines @@
   EXPECT_EQ(model_string, actual);
 
   // Pop open the folder.
   BookmarkButton* button = [bar_ buttonWithTitleEqualTo:@"2f"];
   [[button target] performSelector:@selector(openBookmarkFolderFromButton:)
                         withObject:button];
   BookmarkBarFolderController* folder = [bar_ folderController];
   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
 - (IBAction)deleteBookmark:(id)sender;
 @end
 
 @implementation BookmarkBarControllerNoDelete
 - (IBAction)deleteBookmark:(id)sender {
   // NOP
 }
@@ skipping 44 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:.