Convert ToolbarActionsBarBubbleViews to BubbleDialogDelegate

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

Index: chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views_unittest.cc
diff --git a/chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views_unittest.cc b/chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views_unittest.cc
index 4813548f5824b017329bfe0a63876220d52acde0..de0adaf180597982e4544a71151f746a1ca1edd6 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views_unittest.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views_unittest.cc
@@ -2,27 +2,18 @@
 // 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/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/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:
@@ -47,16 +38,11 @@ TEST_F(ToolbarActionsBarBubbleViewsTest, TestBubbleLayoutActionButton) {
                                                ActionString());
   ToolbarActionsBarBubbleViews* bubble = new ToolbarActionsBarBubbleViews(
       anchor_widget->GetContentsView(), delegate.GetDelegate());
-  views::BubbleDelegateView::CreateBubble(bubble);
+  views::BubbleDialogDelegateView::CreateBubble(bubble);
   bubble->Show();
 
-  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_FALSE(bubble->GetDialogClientView()->cancel_button());
 
   bubble->GetWidget()->Close();
   base::RunLoop().RunUntilIdle();
@@ -70,17 +56,11 @@ TEST_F(ToolbarActionsBarBubbleViewsTest,
   delegate.set_dismiss_button_text(DismissString());
   ToolbarActionsBarBubbleViews* bubble = new ToolbarActionsBarBubbleViews(
       anchor_widget->GetContentsView(), delegate.GetDelegate());
-  views::BubbleDelegateView::CreateBubble(bubble);
+  views::BubbleDialogDelegateView::CreateBubble(bubble);
   bubble->Show();
 
-  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_TRUE(bubble->GetDialogClientView()->cancel_button());
 
   bubble->GetWidget()->Close();
   base::RunLoop().RunUntilIdle();
@@ -97,7 +77,7 @@ TEST_F(ToolbarActionsBarBubbleViewsTest, TestShowAndCloseBubble) {
   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());
@@ -119,14 +99,17 @@ TEST_F(ToolbarActionsBarBubbleViewsTest, TestClickActionButton) {
   ToolbarActionsBarBubbleViews* bubble = new ToolbarActionsBarBubbleViews(
       anchor_widget->GetContentsView(), delegate.GetDelegate());
   views::Widget* bubble_widget =
-      views::BubbleDelegateView::CreateBubble(bubble);
+      views::BubbleDialogDelegateView::CreateBubble(bubble);
   views::test::TestWidgetObserver bubble_observer(bubble_widget);
   bubble->Show();
 
   EXPECT_FALSE(delegate.close_action());
   ui::test::EventGenerator generator(GetContext(),
                                      anchor_widget->GetNativeWindow());
-  generator.MoveMouseTo(GetCenterInScreenCoordinates(bubble->action_button()));
+  generator.MoveMouseTo(bubble->GetDialogClientView()
+                            ->ok_button()
+                            ->GetBoundsInScreen()
+                            .CenterPoint());
   generator.ClickLeftButton();
   base::RunLoop().RunUntilIdle();
   ASSERT_TRUE(delegate.close_action());
@@ -143,7 +126,7 @@ TEST_F(ToolbarActionsBarBubbleViewsTest, TestCloseOnDeactivation) {
   ToolbarActionsBarBubbleViews* bubble = new ToolbarActionsBarBubbleViews(
       anchor_widget->GetContentsView(), delegate.GetDelegate());
   views::Widget* bubble_widget =
-      views::BubbleDelegateView::CreateBubble(bubble);
+      views::BubbleDialogDelegateView::CreateBubble(bubble);
   views::test::TestWidgetObserver bubble_observer(bubble_widget);
   bubble->Show();
 
@@ -153,7 +136,7 @@ TEST_F(ToolbarActionsBarBubbleViewsTest, TestCloseOnDeactivation) {
   anchor_widget->Activate();
   base::RunLoop().RunUntilIdle();
   ASSERT_TRUE(delegate.close_action());
-  EXPECT_EQ(ToolbarActionsBarBubbleDelegate::CLOSE_DISMISS_DEACTIVATION,
+  EXPECT_EQ(ToolbarActionsBarBubbleDelegate::CLOSE_DISMISS_USER_ACTION,
             *delegate.close_action());
   EXPECT_TRUE(bubble_observer.widget_closed());
 }