Tweaks to "Allow InkDropRipple to co-exist with highlight or not exist at all."

ui/views/animation/test/empty_ink_drop_ripple_test_api.h

Index: ui/views/animation/test/empty_ink_drop_ripple_test_api.h
diff --git a/ui/views/animation/test/empty_ink_drop_ripple_test_api.h b/ui/views/animation/test/empty_ink_drop_ripple_test_api.h
new file mode 100644
index 0000000000000000000000000000000000000000..2c42b1534afee882798b842c8de3f61936a9d915
--- /dev/null
+++ b/ui/views/animation/test/empty_ink_drop_ripple_test_api.h
@@ -0,0 +1,41 @@
+// Copyright 2016 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.
+
+#ifndef UI_VIEWS_ANIMATION_TEST_EMPTY_INK_DROP_RIPPLE_TEST_API_H_
+#define UI_VIEWS_ANIMATION_TEST_EMPTY_INK_DROP_RIPPLE_TEST_API_H_
+
+#include <vector>
+
+#include "base/macros.h"
+#include "ui/views/animation/empty_ink_drop_ripple.h"
+#include "ui/views/animation/test/ink_drop_ripple_test_api.h"
+
+namespace ui {
+class LayerAnimator;
+}  // namespace ui
+
+namespace views {
+namespace test {
+
+// Test API to provide internal access to a EmptyInkDropRipple.
+class EmptyInkDropRippleTestApi : public InkDropRippleTestApi {
+ public:
+  explicit EmptyInkDropRippleTestApi(EmptyInkDropRipple* ink_drop_ripple);
+  ~EmptyInkDropRippleTestApi() override;
+
+  // InkDropRippleTestApi:
+  float GetCurrentOpacity() const override;
+
+ protected:
+  // InkDropRippleTestApi:
+  std::vector<ui::LayerAnimator*> GetLayerAnimators() override;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(EmptyInkDropRippleTestApi);
+};
+
+}  // namespace test
+}  // namespace views
+
+#endif  // UI_VIEWS_ANIMATION_TEST_EMPTY_INK_DROP_RIPPLE_TEST_API_H_