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

ui/views/controls/button/blue_button_unittest.cc

Index: ui/views/controls/button/blue_button_unittest.cc
diff --git a/ui/views/controls/button/blue_button_unittest.cc b/ui/views/controls/button/blue_button_unittest.cc
index 687121790856e53f15952435e0ddff49e188607e..8ebd3ca5bb6ccb8969929be83bc84524ba4a6fe1 100644
--- a/ui/views/controls/button/blue_button_unittest.cc
+++ b/ui/views/controls/button/blue_button_unittest.cc
@@ -7,6 +7,7 @@
 #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"
@@ -24,7 +25,9 @@ TEST_F(BlueButtonTest, Border) {
   // 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);