[Views] Update ink drop for omnibox icons

chrome/browser/ui/views/location_bar/icon_label_bubble_view_unittest.cc

 // 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.
 
 #include "chrome/browser/ui/views/location_bar/icon_label_bubble_view.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/layout_constants.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/events/test/event_generator.h"
+#include "ui/views/animation/test/ink_drop_host_view_test_api.h"
+#include "ui/views/animation/test/test_ink_drop.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/test/views_test_base.h"
 
 #if defined(USE_ASH)
 #include "ui/aura/window.h"
 #endif
 
 namespace {
 
+using views::test::InkDropHostViewTestApi;
+using views::test::TestInkDrop;
+
 const int kStayOpenTimeMS = 100;
 const int kOpenTimeMS = 100;
 const int kAnimationDurationMS = (kOpenTimeMS * 2) + kStayOpenTimeMS;
 const int kImageSize = 15;
 const SkColor kTestColor = SkColorSetRGB(64, 64, 64);
 const int kNumberOfSteps = 300;
 
 class TestIconLabelBubbleView : public IconLabelBubbleView {
  public:
   enum State {
     GROWING,
     STEADY,
     SHRINKING,
   };
 
   explicit TestIconLabelBubbleView(const gfx::FontList& font_list)
       : IconLabelBubbleView(font_list, false), value_(0) {
     GetImageView()->SetImageSize(gfx::Size(kImageSize, kImageSize));
     SetLabel(base::ASCIIToUTF16("Label"));
   }
 
   void SetCurrentAnimationValue(int value) {
     value_ = value;
     SizeToPreferredSize();
   }
 
+  void SetInkDrop(std::unique_ptr<views::InkDrop> ink_drop) {
+    InkDropHostViewTestApi(this).SetInkDrop(std::move(ink_drop));
+  }
+
   int width() const { return bounds().width(); }
   bool IsLabelVisible() const { return label()->visible(); }
   void SetLabelVisible(bool visible) { label()->SetVisible(visible); }
   const gfx::Rect& GetLabelBounds() const { return label()->bounds(); }
 
   State state() const {
     const double kOpenFraction =
         static_cast<double>(kOpenTimeMS) / kAnimationDurationMS;
     double state = value_ / (double)kNumberOfSteps;
     if (state < kOpenFraction)
       return GROWING;
     if (state > (1.0 - kOpenFraction))
       return SHRINKING;
     return STEADY;
   }
 
+  void OnWidgetVisibilityChanged(views::Widget* widget, bool visible) override {

[bruthig, 2017/03/24 20:48:03]

Is this needed?

[spqchan, 2017/03/27 23:41:51]

Removed

+    IconLabelBubbleView::OnWidgetVisibilityChanged(widget, visible);
+  };
+
  protected:
   // IconLabelBubbleView:
   SkColor GetTextColor() const override { return kTestColor; }
 
   bool ShouldShowLabel() const override {
     return !IsShrinking() ||
            (width() > (image()->GetPreferredSize().width() +
                        2 * LocationBarView::kIconInteriorPadding +
                        2 * GetLayoutConstant(LOCATION_BAR_ELEMENT_PADDING)));
   }
@@ skipping 20 matching lines @@
   int value_;
   DISALLOW_COPY_AND_ASSIGN(TestIconLabelBubbleView);
 };
 
 }  // namespace
 
 class IconLabelBubbleViewTest : public views::ViewsTestBase {
  public:
   IconLabelBubbleViewTest()
       : views::ViewsTestBase(),
+        widget_(nullptr),
+        view_(nullptr),
+        ink_drop_(nullptr),
         steady_reached_(false),
         shrinking_reached_(false),
         minimum_size_reached_(false),
         previous_width_(0),
         initial_image_x_(0) {}
   ~IconLabelBubbleViewTest() override {}
 
  protected:
   // views::ViewsTestBase:
   void SetUp() override {
     views::ViewsTestBase::SetUp();
     gfx::FontList font_list;
-    view_.reset(new TestIconLabelBubbleView(font_list));
+
+    CreateWidget();
+    generator_.reset(new ui::test::EventGenerator(widget_->GetNativeWindow()));
+    view_ = new TestIconLabelBubbleView(font_list);
+    view_->SetBoundsRect(gfx::Rect(0, 0, 24, 24));
+    widget_->SetContentsView(view_);
+
+    widget_->Show();
+  }
+
+  void TearDown() override {
+    generator_.reset();
+    if (widget_ && !widget_->IsClosed())
+      widget_->Close();
+
+    ViewsTestBase::TearDown();
   }
 
   void VerifyWithAnimationStep(int step) {
     Reset();
     for (int value = 0; value < kNumberOfSteps; value += step) {
       SetValue(value);
       VerifyAnimationStep();
     }
     view_->SetLabelVisible(false);
   }
 
+  TestInkDrop* ink_drop() { return ink_drop_; }
+
+  TestIconLabelBubbleView* view() { return view_; }
+
+  ui::test::EventGenerator* generator() { return generator_.get(); }
+
+  void AttachInkDrop() {
+    ink_drop_ = new TestInkDrop();
+    InkDropHostViewTestApi(view_).SetInkDrop(base::WrapUnique(ink_drop_));
+  }
+
  private:
+  void CreateWidget() {
+    DCHECK(!widget_);
+
+    widget_ = new views::Widget;
+    views::Widget::InitParams params =
+        CreateParams(views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
+    params.bounds = gfx::Rect(0, 0, 200, 200);
+    widget_->Init(params);
+  }
+
   void Reset() {
     view_->SetLabelVisible(true);
     SetValue(0);
     steady_reached_ = false;
     shrinking_reached_ = false;
     minimum_size_reached_ = false;
     previous_width_ = 0;
     initial_image_x_ = GetImageBounds().x();
     EXPECT_EQ(0, initial_image_x_);
   }
@@ skipping 58 matching lines @@
   int width() { return view_->width(); }
 
   bool IsLabelVisible() { return view_->IsLabelVisible(); }
 
   const gfx::Rect& GetLabelBounds() const { return view_->GetLabelBounds(); }
 
   const gfx::Rect& GetImageBounds() const {
     return view_->GetImageView()->bounds();
   }
 
-  std::unique_ptr<TestIconLabelBubbleView> view_;
+  views::Widget* widget_;
+  TestIconLabelBubbleView* view_;
+  TestInkDrop* ink_drop_;
+  std::unique_ptr<ui::test::EventGenerator> generator_;
 
   bool steady_reached_;
   bool shrinking_reached_;
   bool minimum_size_reached_;
   int previous_width_;
   int initial_image_x_;
 };
 
 // Tests layout rules for IconLabelBubbleView while simulating animation.
 // The animation is first growing the bubble from zero, then keeping its size
 // constant and finally shrinking it down to its minimum size which is the image
 // size.
 // Various step sizes during animation simulate different possible timing.
 TEST_F(IconLabelBubbleViewTest, AnimateLayout) {
   VerifyWithAnimationStep(1);
   VerifyWithAnimationStep(5);
   VerifyWithAnimationStep(10);
   VerifyWithAnimationStep(25);
 }
 
+TEST_F(IconLabelBubbleViewTest, InkDropState) {
+  AttachInkDrop();
+  generator()->ClickLeftButton();
+  EXPECT_EQ(views::InkDropState::ACTION_PENDING,
+            ink_drop()->GetTargetInkDropState());
+  view()->OnWidgetVisibilityChanged(nullptr, false);
+  EXPECT_EQ(views::InkDropState::HIDDEN, ink_drop()->GetTargetInkDropState());
+}
+
 #if defined(USE_ASH)
 // Verifies IconLabelBubbleView::GetPreferredSize() doesn't crash when there is
 // a widget but no compositor.
 using IconLabelBubbleViewCrashTest = views::ViewsTestBase;
 
 TEST_F(IconLabelBubbleViewCrashTest,
        GetPreferredSizeDoesntCrashWhenNoCompositor) {
   gfx::FontList font_list;
   views::Widget::InitParams params =
       CreateParams(views::Widget::InitParams::TYPE_WINDOW);
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   views::Widget widget;
   widget.Init(params);
   IconLabelBubbleView* icon_label_bubble_view =
       new TestIconLabelBubbleView(font_list);
   icon_label_bubble_view->SetLabel(base::ASCIIToUTF16("x"));
   widget.GetContentsView()->AddChildView(icon_label_bubble_view);
   aura::Window* widget_native_view = widget.GetNativeView();
   // Remove the window from its parent. This means GetWidget() in
   // IconLabelBubbleView will return non-null, but GetWidget()->GetCompositor()
   // will return null.
   ASSERT_TRUE(widget_native_view->parent());
   widget_native_view->parent()->RemoveChild(widget_native_view);
   static_cast<views::View*>(icon_label_bubble_view)->GetPreferredSize();
 }
 #endif