Allow InkDropRipple to co-exist with highlight

ui/views/animation/test/test_ink_drop_host.h

Index: ui/views/animation/test/test_ink_drop_host.h
diff --git a/ui/views/animation/test/test_ink_drop_host.h b/ui/views/animation/test/test_ink_drop_host.h
index 6b4643077a7bb5c6b6bbc093014bb01a20556188..92b77bb449f1c9e2c4f68ca97bff127b59a3f4af 100644
--- a/ui/views/animation/test/test_ink_drop_host.h
+++ b/ui/views/animation/test/test_ink_drop_host.h
@@ -27,6 +27,10 @@ class TestInkDropHost : public InkDropHost {
     disable_timers_for_test_ = disable_timers_for_test;
   }
 
+  void set_ripple_overrides_highlight(bool overrides_highlight) {
+    ripple_overrides_highlight_ = overrides_highlight;
+  }
+
   // TestInkDropHost:
   void AddInkDropLayer(ui::Layer* ink_drop_layer) override;
   void RemoveInkDropLayer(ui::Layer* ink_drop_layer) override;
@@ -38,6 +42,8 @@ class TestInkDropHost : public InkDropHost {
 
   bool should_show_highlight_;
 
+  bool ripple_overrides_highlight_;
+
   // When true, the InkDropRipple/InkDropHighlight instances will have their
   // timers disabled after creation.
   bool disable_timers_for_test_;