Convert ToolbarActionsBarBubbleViews to BubbleDialogDelegate

chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views_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/toolbar/toolbar_actions_bar_bubble_views.h"
+
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/toolbar/test_toolbar_actions_bar_bubble_delegate.h"
-#include "chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/test/event_generator.h"
-#include "ui/views/bubble/bubble_delegate.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/test/test_widget_observer.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/widget.h"
-
-namespace {
-
-gfx::Point GetCenterInScreenCoordinates(const views::View* view) {
-  gfx::Point center(view->width() / 2, view->height() / 2);
-  views::View::ConvertPointToScreen(view, &center);
-  return center;
-}
-
-}  // namespace
+#include "ui/views/window/dialog_client_view.h"
 
 class ToolbarActionsBarBubbleViewsTest : public views::ViewsTestBase {
  protected:
   ToolbarActionsBarBubbleViewsTest() {}
   ~ToolbarActionsBarBubbleViewsTest() override {}
 
   void TearDown() override {
     anchor_widget_.reset();
     views::ViewsTestBase::TearDown();
   }
 
   std::unique_ptr<views::Widget> CreateAnchorWidget() {
     std::unique_ptr<views::Widget> anchor_widget(new views::Widget());
     views::Widget::InitParams params =
         CreateParams(views::Widget::InitParams::TYPE_WINDOW);
     params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
     anchor_widget->Init(params);
     return anchor_widget;
   }
 
   void ShowBubble(TestToolbarActionsBarBubbleDelegate* delegate) {
     ASSERT_TRUE(delegate);
     ASSERT_FALSE(bubble_widget_);
     ASSERT_FALSE(bubble_);
     anchor_widget_ = CreateAnchorWidget();
     bubble_ = new ToolbarActionsBarBubbleViews(
       anchor_widget_->GetContentsView(), delegate->GetDelegate());
-    bubble_widget_ =
-        views::BubbleDelegateView::CreateBubble(bubble_);
+    bubble_widget_ = views::BubbleDialogDelegateView::CreateBubble(bubble_);
     bubble_->Show();
   }
 
   void CloseBubble() {
     ASSERT_TRUE(bubble_);
     bubble_->GetWidget()->Close();
     base::RunLoop().RunUntilIdle();
     bubble_ = nullptr;
     bubble_widget_ = nullptr;
   }
 
   void ClickView(const views::View* view) {
     ASSERT_TRUE(view);
     ui::test::EventGenerator generator(GetContext(),
                                        anchor_widget_->GetNativeWindow());
-    generator.MoveMouseTo(GetCenterInScreenCoordinates(view));
+    generator.MoveMouseTo(view->GetBoundsInScreen().CenterPoint());
     generator.ClickLeftButton();
     base::RunLoop().RunUntilIdle();
   }
 
   base::string16 HeadingString() { return base::ASCIIToUTF16("Heading"); }
   base::string16 BodyString() { return base::ASCIIToUTF16("Body"); }
   base::string16 ActionString() { return base::ASCIIToUTF16("Action"); }
   base::string16 DismissString() { return base::ASCIIToUTF16("Dismiss"); }
   base::string16 LearnMoreString() { return base::ASCIIToUTF16("Learn"); }
   base::string16 ItemListString() {
@@ skipping 10 matching lines @@
   ToolbarActionsBarBubbleViews* bubble_ = nullptr;
 
   DISALLOW_COPY_AND_ASSIGN(ToolbarActionsBarBubbleViewsTest);
 };
 
 TEST_F(ToolbarActionsBarBubbleViewsTest, TestBubbleLayoutActionButton) {
   TestToolbarActionsBarBubbleDelegate delegate(HeadingString(), BodyString(),
                                                ActionString());
   ShowBubble(&delegate);
 
-  EXPECT_TRUE(bubble()->heading_label());
-  EXPECT_EQ(HeadingString(), bubble()->heading_label()->text());
-  EXPECT_TRUE(bubble()->content_label());
-  EXPECT_EQ(BodyString(), bubble()->content_label()->text());
-  EXPECT_TRUE(bubble()->action_button());
-  EXPECT_EQ(ActionString(), bubble()->action_button()->GetText());
-  EXPECT_FALSE(bubble()->dismiss_button());
-  EXPECT_FALSE(bubble()->learn_more_button());
-  EXPECT_FALSE(bubble()->item_list());
+  EXPECT_TRUE(bubble()->GetDialogClientView()->ok_button());
+  EXPECT_EQ(ActionString(),
+            bubble()->GetDialogClientView()->ok_button()->GetText());
+  EXPECT_FALSE(bubble()->GetDialogClientView()->cancel_button());
 
   CloseBubble();
 }
 
 TEST_F(ToolbarActionsBarBubbleViewsTest,
        TestBubbleLayoutActionAndDismissButton) {
   TestToolbarActionsBarBubbleDelegate delegate(HeadingString(), BodyString(),
                                                ActionString());
   delegate.set_dismiss_button_text(DismissString());
+
   ShowBubble(&delegate);
 
-  EXPECT_TRUE(bubble()->heading_label());
-  EXPECT_EQ(HeadingString(), bubble()->heading_label()->text());
-  EXPECT_TRUE(bubble()->content_label());
-  EXPECT_EQ(BodyString(), bubble()->content_label()->text());
-  EXPECT_TRUE(bubble()->action_button());
-  EXPECT_EQ(ActionString(), bubble()->action_button()->GetText());
-  EXPECT_TRUE(bubble()->dismiss_button());
-  EXPECT_EQ(DismissString(), bubble()->dismiss_button()->GetText());
+  EXPECT_TRUE(bubble()->GetDialogClientView()->ok_button());
+  EXPECT_EQ(ActionString(),
+            bubble()->GetDialogClientView()->ok_button()->GetText());
+  EXPECT_TRUE(bubble()->GetDialogClientView()->cancel_button());
+  EXPECT_EQ(DismissString(),
+            bubble()->GetDialogClientView()->cancel_button()->GetText());
+
   EXPECT_FALSE(bubble()->learn_more_button());
   EXPECT_FALSE(bubble()->item_list());
 
   CloseBubble();
 }
 
 TEST_F(ToolbarActionsBarBubbleViewsTest,
        TestBubbleLayoutActionDismissAndLearnMoreButton) {
   TestToolbarActionsBarBubbleDelegate delegate(HeadingString(), BodyString(),
                                                ActionString());
   delegate.set_dismiss_button_text(DismissString());
   delegate.set_learn_more_button_text(LearnMoreString());
   ShowBubble(&delegate);
 
-  EXPECT_TRUE(bubble()->heading_label());
-  EXPECT_EQ(HeadingString(), bubble()->heading_label()->text());
-  EXPECT_TRUE(bubble()->content_label());
-  EXPECT_EQ(BodyString(), bubble()->content_label()->text());
-  EXPECT_TRUE(bubble()->action_button());
-  EXPECT_EQ(ActionString(), bubble()->action_button()->GetText());
-  EXPECT_TRUE(bubble()->dismiss_button());
-  EXPECT_EQ(DismissString(), bubble()->dismiss_button()->GetText());
+  EXPECT_TRUE(bubble()->GetDialogClientView()->ok_button());
+  EXPECT_EQ(ActionString(),
+            bubble()->GetDialogClientView()->ok_button()->GetText());
+  EXPECT_TRUE(bubble()->GetDialogClientView()->cancel_button());
+  EXPECT_EQ(DismissString(),
+            bubble()->GetDialogClientView()->cancel_button()->GetText());
   EXPECT_TRUE(bubble()->learn_more_button());
   EXPECT_EQ(LearnMoreString(), bubble()->learn_more_button()->text());
   EXPECT_FALSE(bubble()->item_list());
 
   CloseBubble();
 }
 
 TEST_F(ToolbarActionsBarBubbleViewsTest, TestBubbleLayoutListView) {
   TestToolbarActionsBarBubbleDelegate delegate(HeadingString(), BodyString(),
                                                ActionString());
   delegate.set_item_list_text(ItemListString());
   ShowBubble(&delegate);
 
-  EXPECT_TRUE(bubble()->heading_label());
-  EXPECT_EQ(HeadingString(), bubble()->heading_label()->text());
-  EXPECT_TRUE(bubble()->content_label());
-  EXPECT_EQ(BodyString(), bubble()->content_label()->text());
-  EXPECT_TRUE(bubble()->action_button());
-  EXPECT_EQ(ActionString(), bubble()->action_button()->GetText());
-  EXPECT_FALSE(bubble()->dismiss_button());
+  EXPECT_TRUE(bubble()->GetDialogClientView()->ok_button());
+  EXPECT_EQ(ActionString(),
+            bubble()->GetDialogClientView()->ok_button()->GetText());
+  EXPECT_FALSE(bubble()->GetDialogClientView()->cancel_button());
   EXPECT_FALSE(bubble()->learn_more_button());
   EXPECT_TRUE(bubble()->item_list());
   EXPECT_EQ(ItemListString(), bubble()->item_list()->text());
 
   CloseBubble();
 }
 
 TEST_F(ToolbarActionsBarBubbleViewsTest, TestShowAndCloseBubble) {
   std::unique_ptr<views::Widget> anchor_widget = CreateAnchorWidget();
   TestToolbarActionsBarBubbleDelegate delegate(HeadingString(), BodyString(),
                                                ActionString());
   delegate.set_dismiss_button_text(DismissString());
   ToolbarActionsBarBubbleViews* bubble = new ToolbarActionsBarBubbleViews(
       anchor_widget->GetContentsView(), delegate.GetDelegate());
 
   EXPECT_FALSE(delegate.shown());
   EXPECT_FALSE(delegate.close_action());
   views::Widget* bubble_widget =
-      views::BubbleDelegateView::CreateBubble(bubble);
+      views::BubbleDialogDelegateView::CreateBubble(bubble);
   views::test::TestWidgetObserver bubble_observer(bubble_widget);
   bubble->Show();
   EXPECT_TRUE(delegate.shown());
   EXPECT_FALSE(delegate.close_action());
 
-  bubble_widget->Close();
+  bubble->GetDialogClientView()->CancelWindow();
   base::RunLoop().RunUntilIdle();
   ASSERT_TRUE(delegate.close_action());
   EXPECT_EQ(ToolbarActionsBarBubbleDelegate::CLOSE_DISMISS_USER_ACTION,
             *delegate.close_action());
   EXPECT_TRUE(bubble_observer.widget_closed());
 }
 
 TEST_F(ToolbarActionsBarBubbleViewsTest, TestClickActionButton) {
   TestToolbarActionsBarBubbleDelegate delegate(HeadingString(), BodyString(),
                                                ActionString());
   delegate.set_dismiss_button_text(DismissString());
   delegate.set_learn_more_button_text(LearnMoreString());
   ShowBubble(&delegate);
   views::test::TestWidgetObserver bubble_observer(bubble_widget());
 
   EXPECT_FALSE(delegate.close_action());
-  ClickView(bubble()->action_button());
+  ClickView(bubble()->GetDialogClientView()->ok_button());
   ASSERT_TRUE(delegate.close_action());
   EXPECT_EQ(ToolbarActionsBarBubbleDelegate::CLOSE_EXECUTE,
             *delegate.close_action());
   EXPECT_TRUE(bubble_observer.widget_closed());
 }
 
 TEST_F(ToolbarActionsBarBubbleViewsTest, TestClickDismissButton) {
   TestToolbarActionsBarBubbleDelegate delegate(HeadingString(), BodyString(),
                                                ActionString());
   delegate.set_dismiss_button_text(DismissString());
   delegate.set_learn_more_button_text(LearnMoreString());
   ShowBubble(&delegate);
   views::test::TestWidgetObserver bubble_observer(bubble_widget());
 
   EXPECT_FALSE(delegate.close_action());
-  ClickView(bubble()->dismiss_button());
+  ClickView(bubble()->GetDialogClientView()->cancel_button());
   ASSERT_TRUE(delegate.close_action());
   EXPECT_EQ(ToolbarActionsBarBubbleDelegate::CLOSE_DISMISS_USER_ACTION,
             *delegate.close_action());
 }
 
 TEST_F(ToolbarActionsBarBubbleViewsTest, TestClickLearnMoreLink) {
   TestToolbarActionsBarBubbleDelegate delegate(HeadingString(), BodyString(),
                                                ActionString());
   delegate.set_dismiss_button_text(DismissString());
   delegate.set_learn_more_button_text(LearnMoreString());
@@ skipping 31 matching lines @@
   ShowBubble(&delegate);
   views::test::TestWidgetObserver bubble_observer(bubble_widget());
 
   EXPECT_FALSE(delegate.close_action());
   // Activate another widget. The bubble shouldn't close.
   anchor_widget()->Activate();
   base::RunLoop().RunUntilIdle();
   EXPECT_FALSE(delegate.close_action());
   CloseBubble();
 }