Pushed InkDropHost inheritence up to CustomButton.

ui/views/controls/button/custom_button_unittest.cc

 // 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 "ui/views/controls/button/custom_button.h"
 
 #include "base/macros.h"
 #include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/layout.h"
@@ skipping 114 matching lines @@
 
  private:
   InkDropHost* ink_drop_host_;
   bool* ink_shown_;
   bool* ink_hidden_;
 
   DISALLOW_COPY_AND_ASSIGN(TestInkDropDelegate);
 };
 
 // A test Button class that owns a TestInkDropDelegate.
-class TestButtonWithInkDrop : public TestCustomButton,
-                              public views::InkDropHost {
+class TestButtonWithInkDrop : public TestCustomButton {
  public:
   TestButtonWithInkDrop(bool* ink_shown, bool* ink_hidden)
       : TestCustomButton(),
         ink_drop_delegate_(
             new TestInkDropDelegate(this, ink_shown, ink_hidden)) {
     set_ink_drop_delegate(ink_drop_delegate_.get());
   }
   ~TestButtonWithInkDrop() override {}
 
   // views::InkDropHost:
@@ skipping 320 matching lines @@
   generator.PressLeftButton();
   EXPECT_TRUE(ink_shown());
   EXPECT_FALSE(ink_hidden());
 
   widget()->SetCapture(button());
   widget()->ReleaseCapture();
   EXPECT_TRUE(ink_hidden());
 }
 
 }  // namespace views