Use ink drop hover for focus states on toolbar buttons and location

ui/views/controls/button/blue_button_unittest.cc

 // Copyright 2014 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 "ui/views/controls/button/blue_button.h"
 
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
+#include "ui/base/material_design/material_design_controller.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/views/controls/button/label_button_border.h"
 #include "ui/views/test/widget_test.h"
 
 namespace views {
 
 using BlueButtonTest = test::WidgetTest;
 
 TEST_F(BlueButtonTest, Border) {
   // The buttons must be added to a Widget so that borders are correctly
   // applied once the NativeTheme is determined.
   Widget* widget = CreateTopLevelPlatformWidget();
 
   // Compared to a normal LabelButton...
   LabelButton* button = new LabelButton(nullptr, base::ASCIIToUTF16("foo"));
   EXPECT_EQ(Button::STYLE_TEXTBUTTON, button->style());
-  EXPECT_TRUE(button->focus_painter());
+  // Focus painter by default only in non-md.
+  EXPECT_EQ(ui::MaterialDesignController::IsModeMaterial(),
+            !button->focus_painter());
 
   // Switch to the same style as BlueButton for a more compelling comparison.
   button->SetStyle(Button::STYLE_BUTTON);
   EXPECT_EQ(Button::STYLE_BUTTON, button->style());
   EXPECT_FALSE(button->focus_painter());
 
   widget->GetContentsView()->AddChildView(button);
   button->SizeToPreferredSize();
   gfx::Canvas button_canvas(button->size(), 1.0, true);
   button->border()->Paint(*button, &button_canvas);
@@ skipping 21 matching lines @@
   blue_button->border()->Paint(*blue_button, &canvas);
   EXPECT_EQ(button->GetText(), blue_button->GetText());
   EXPECT_EQ(button->size(), blue_button->size());
   EXPECT_FALSE(gfx::BitmapsAreEqual(button_canvas.ExtractImageRep().sk_bitmap(),
                                     canvas.ExtractImageRep().sk_bitmap()));
 
   widget->CloseNow();
 }
 
 }  // namespace views