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

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_button_cell_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 "base/mac/scoped_nsobject.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_button_cell.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/resources/grit/ui_resources.h"
@@ skipping 47 matching lines @@
   NSRect rect = NSMakeRect(20, 20, 20, 20);
 
   [cell setBookmarkCellText:@"" image:image];
   float icon_x_without_title = ([cell imageRectForBounds:rect]).origin.x;
   float cell_width_without_title = ([cell cellSize]).width;
 
   [cell setBookmarkCellText:@"test" image:image];
   float icon_x_with_title = ([cell imageRectForBounds:rect]).origin.x;
   float cell_width_with_title = ([cell cellSize]).width;
 
-  EXPECT_LT(icon_x_without_title, icon_x_with_title);
+  if (ui::MaterialDesignController::IsModeMaterial()) {
+    EXPECT_GT(icon_x_without_title, icon_x_with_title);
+  } else {
+    EXPECT_LT(icon_x_without_title, icon_x_with_title);
+  }
   EXPECT_LT(cell_width_without_title, cell_width_with_title);
 
   [folder_cell setBookmarkCellText:@"" image:image];
   float folder_cell_x_without_title = ([cell imageRectForBounds:rect]).origin.x;
   float folder_cell_width_without_title = ([cell cellSize]).width;
 
   [folder_cell setBookmarkCellText:@"test" image:image];
   float folder_cell_x_with_title = ([cell imageRectForBounds:rect]).origin.x;
   float folder_cell_width_with_title = ([cell cellSize]).width;
 
   EXPECT_EQ(folder_cell_x_without_title, folder_cell_x_with_title);
   EXPECT_EQ(folder_cell_width_without_title, folder_cell_width_with_title);
 }
 
 } // namespace