Allow InkDropRipple to co-exist with highlight

ui/views/controls/button/label_button.cc

Index: ui/views/controls/button/label_button.cc
diff --git a/ui/views/controls/button/label_button.cc b/ui/views/controls/button/label_button.cc
index face3975a2e5901512cbb2fb853e2e128b93b81f..f3cc5c887243952face30d3fa29e8bfee9b2a44b 100644
--- a/ui/views/controls/button/label_button.cc
+++ b/ui/views/controls/button/label_button.cc
@@ -445,10 +445,9 @@ std::unique_ptr<views::InkDropRipple> LabelButton::CreateInkDropRipple() const {
   return GetText().empty()
              ? CreateDefaultInkDropRipple(
                    image()->GetMirroredBounds().CenterPoint())
-             : std::unique_ptr<views::InkDropRipple>(
-                   new views::FloodFillInkDropRipple(
-                       GetLocalBounds(), GetInkDropCenterBasedOnLastEvent(),
-                       GetInkDropBaseColor(), ink_drop_visible_opacity()));
+             : base::WrapUnique(new views::FloodFillInkDropRipple(

[bruthig, 2016/08/25 17:45:29]

I believe the convention is to use MakeUnique().  See discussion here:
https://groups.google.com/a/chromium.org/forum/#!topic/chromium-dev/iQgMedVA8-k

[Evan Stade, 2016/08/26 23:36:15]

Done.

+                   GetLocalBounds(), GetInkDropCenterBasedOnLastEvent(),
+                   GetInkDropBaseColor(), ink_drop_visible_opacity()));
 }
 
 std::unique_ptr<views::InkDropHighlight> LabelButton::CreateInkDropHighlight()