Moved AppMenu ACTIVATED/DEACTIVATED ink drop handling in to MenuButton.

chrome/browser/ui/views/toolbar/toolbar_action_view_unittest.cc

 // Copyright 2015 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 "base/macros.h"
 #include "base/run_loop.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/ui/toolbar/test_toolbar_action_view_controller.h"
 #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_action_view.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread.h"
 #include "content/public/test/test_web_contents_factory.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/events/test/event_generator.h"
+#include "ui/views/animation/test/test_ink_drop_delegate.h"
 #include "ui/views/test/views_test_base.h"
 
 namespace {
 
 // A test delegate for a toolbar action view.
 class TestToolbarActionViewDelegate : public ToolbarActionView::Delegate {
  public:
   TestToolbarActionViewDelegate() : shown_in_menu_(false),
                                     overflow_reference_view_(nullptr),
                                     web_contents_(nullptr) {}
@@ skipping 94 matching lines @@
  private:
   // The widget managed by this test.
   views::Widget* widget_;
 
   // Web contents need a fake ui thread.
   content::TestBrowserThread ui_thread_;
 
   DISALLOW_COPY_AND_ASSIGN(ToolbarActionViewUnitTest);
 };
 
+// A MenuButton subclass that provides access to some MenuButton internals.
+class TestToolbarActionView : public ToolbarActionView {
+ public:
+  TestToolbarActionView(ToolbarActionViewController* view_controller,
+                        Delegate* delegate)
+      : ToolbarActionView(view_controller, delegate) {}
+
+  ~TestToolbarActionView() override {}
+
+  // Accessors to protected ToolbarActionView methods.
+  void set_ink_drop_delegate(views::InkDropDelegate* ink_drop_delegate) {
+    ToolbarActionView::set_ink_drop_delegate(ink_drop_delegate);
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(TestToolbarActionView);
+};
+
+// Verifies there is no crash when a ToolbarActionView with an InkDropDelegate
+// is destroyed while holding a |pressed_lock_|.
+TEST_F(ToolbarActionViewUnitTest,
+       NoCrashWhenDestroyingToolbarActionViewThatHasAPressedLock) {
+  TestToolbarActionViewController controller("fake controller");
+  TestToolbarActionViewDelegate action_view_delegate;
+
+  // Create a new toolbar action view.
+  scoped_ptr<ToolbarActionView> view(
+      new ToolbarActionView(&controller, &action_view_delegate));
+  view->set_owned_by_client();
+  view->SetBoundsRect(gfx::Rect(0, 0, 200, 20));
+  widget()->SetContentsView(view.get());
+  widget()->Show();
+
+  controller.ShowPopup(true);
+
+  view.reset();
+}
+
+// Verifies the InkDropAnimation used by the ToolbarActionView doesn't fail a
+// DCHECK for an unsupported transition from ACTIVATED to ACTION_PENDING.
+TEST_F(ToolbarActionViewUnitTest,
+       NoCrashWhenPressingMouseOnToolbarActionViewThatHasAPressedLock) {
+  TestToolbarActionViewController controller("fake controller");
+  TestToolbarActionViewDelegate action_view_delegate;
+
+  // Create a new toolbar action view.
+  ToolbarActionView view(&controller, &action_view_delegate);
+  view.set_owned_by_client();
+  view.SetBoundsRect(gfx::Rect(0, 0, 200, 20));
+  widget()->SetContentsView(&view);
+  widget()->Show();
+
+  ui::test::EventGenerator generator(GetContext(), widget()->GetNativeWindow());
+
+  controller.ShowPopup(true);
+  generator.PressLeftButton();
+}
+
 // Test the basic ui of a ToolbarActionView and that it responds correctly to
 // a controller's state.
 TEST_F(ToolbarActionViewUnitTest, BasicToolbarActionViewTest) {
   TestingProfile profile;
 
-  // ViewsTestBase initializees the aura environment, so the factory shouldn't.
+  // ViewsTestBase initializes the aura environment, so the factory shouldn't.
   content::TestWebContentsFactory web_contents_factory;
 
   TestToolbarActionViewController controller("fake controller");
   TestToolbarActionViewDelegate action_view_delegate;
 
   // Configure the test controller and delegate.
   base::string16 name = base::ASCIIToUTF16("name");
   controller.SetAccessibleName(name);
   base::string16 tooltip = base::ASCIIToUTF16("tooltip");
   controller.SetTooltip(tooltip);
@@ skipping 77 matching lines @@
   // If the view isn't visible, the overflow button should be pressed for
   // popups.
   view.SetVisible(false);
   controller.ShowPopup(true);
   EXPECT_EQ(views::Button::STATE_NORMAL, view.state());
   EXPECT_EQ(views::Button::STATE_PRESSED, overflow_button.state());
   controller.HidePopup();
   EXPECT_EQ(views::Button::STATE_NORMAL, view.state());
   EXPECT_EQ(views::Button::STATE_NORMAL, overflow_button.state());
 }