Vanquish views::BubbleDelegate{View,}

ash/wm/immersive_fullscreen_controller_unittest.cc

Index: ash/wm/immersive_fullscreen_controller_unittest.cc
diff --git a/ash/wm/immersive_fullscreen_controller_unittest.cc b/ash/wm/immersive_fullscreen_controller_unittest.cc
index 5547ba6e9d9ad45e00a8965e4c9c35b46ee79acc..663eec257c5f8d2b2a99983cf83e7be760c68e45 100644
--- a/ash/wm/immersive_fullscreen_controller_unittest.cc
+++ b/ash/wm/immersive_fullscreen_controller_unittest.cc
@@ -25,7 +25,7 @@
 #include "ui/events/test/event_generator.h"
 #include "ui/events/test/test_event_handler.h"
 #include "ui/gfx/animation/slide_animation.h"
-#include "ui/views/bubble/bubble_delegate.h"
+#include "ui/views/bubble/bubble_dialog_delegate.h"
 #include "ui/views/controls/native/native_view_host.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
@@ -34,6 +34,16 @@ namespace ash {
 
 namespace {
 
+class TestBubbleDialogDelegate : public views::BubbleDialogDelegateView {
+ public:
+  explicit TestBubbleDialogDelegate(views::View* anchor)
+      : BubbleDialogDelegateView(anchor, views::BubbleBorder::NONE) {}
+  ~TestBubbleDialogDelegate() override {}
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(TestBubbleDialogDelegate);
+};
+
 class MockImmersiveFullscreenControllerDelegate
     : public ImmersiveFullscreenController::Delegate {
  public:
@@ -665,10 +675,10 @@ TEST_F(ImmersiveFullscreenControllerTest, DifferentModalityEnterExit) {
 }
 
 // Test when the SWIPE_CLOSE edge gesture closes the top-of-window views.
-#if defined(OS_WIN)
-// On Windows, touch events do not result in mouse events being disabled.  As
-// a result, the last part of this test which ends the reveal via a gesture will
-// not work correctly.  See crbug.com/332430, and the function
+#if !defined(OS_CHROMEOS)
+// On Windows/Linux, touch events do not result in mouse events being disabled.
+// As a result, the last part of this test which ends the reveal via a gesture
+// will not work correctly.  See crbug.com/332430, and the function
 // ShouldHideCursorOnTouch() in compound_event_filter.cc.
 #define MAYBE_EndRevealViaGesture DISABLED_EndRevealViaGesture
 #else
@@ -914,8 +924,8 @@ TEST_F(ImmersiveFullscreenControllerTest, Bubbles) {
   // 1) Test that a bubble anchored to a child of the top container triggers
   // a reveal and keeps the top-of-window views revealed for the duration of
   // its visibility.
-  views::Widget* bubble_widget1(views::BubbleDelegateView::CreateBubble(
-      new views::BubbleDelegateView(child_view, views::BubbleBorder::NONE)));
+  views::Widget* bubble_widget1(views::BubbleDialogDelegateView::CreateBubble(
+      new TestBubbleDialogDelegate(child_view)));
   bubble_widget1->Show();
   EXPECT_TRUE(controller()->IsRevealed());
 
@@ -926,8 +936,8 @@ TEST_F(ImmersiveFullscreenControllerTest, Bubbles) {
       ImmersiveFullscreenController::ANIMATE_REVEAL_NO));
   EXPECT_TRUE(controller()->IsRevealed());
 
-  views::Widget* bubble_widget2 = views::BubbleDelegateView::CreateBubble(
-      new views::BubbleDelegateView(child_view, views::BubbleBorder::NONE));
+  views::Widget* bubble_widget2 = views::BubbleDialogDelegateView::CreateBubble(
+      new TestBubbleDialogDelegate(child_view));
   bubble_widget2->Show();
   EXPECT_TRUE(controller()->IsRevealed());
   revealed_lock.reset();
@@ -939,8 +949,8 @@ TEST_F(ImmersiveFullscreenControllerTest, Bubbles) {
   // 2) Test that transitioning from keeping the top-of-window views revealed
   // because of a bubble to keeping the top-of-window views revealed because of
   // mouse hover by activating |top_container_widget| works.
-  views::Widget* bubble_widget3 = views::BubbleDelegateView::CreateBubble(
-      new views::BubbleDelegateView(child_view, views::BubbleBorder::NONE));
+  views::Widget* bubble_widget3 = views::BubbleDialogDelegateView::CreateBubble(
+      new TestBubbleDialogDelegate(child_view));
   bubble_widget3->Show();
   SetHovered(true);
   EXPECT_TRUE(controller()->IsRevealed());
@@ -952,18 +962,18 @@ TEST_F(ImmersiveFullscreenControllerTest, Bubbles) {
   SetHovered(false);
   EXPECT_FALSE(controller()->IsRevealed());
 
-  views::BubbleDelegateView* bubble_delegate4(new views::BubbleDelegateView(
-      child_view, views::BubbleBorder::NONE));
+  views::BubbleDialogDelegateView* bubble_delegate4(
+      new TestBubbleDialogDelegate(child_view));
   bubble_delegate4->set_can_activate(false);
-  views::Widget* bubble_widget4(views::BubbleDelegateView::CreateBubble(
-      bubble_delegate4));
+  views::Widget* bubble_widget4(
+      views::BubbleDialogDelegateView::CreateBubble(bubble_delegate4));
   bubble_widget4->Show();
 
-  views::BubbleDelegateView* bubble_delegate5(new views::BubbleDelegateView(
-      child_view, views::BubbleBorder::NONE));
+  views::BubbleDialogDelegateView* bubble_delegate5(
+      new TestBubbleDialogDelegate(child_view));
   bubble_delegate5->set_can_activate(false);
-  views::Widget* bubble_widget5(views::BubbleDelegateView::CreateBubble(
-      bubble_delegate5));
+  views::Widget* bubble_widget5(
+      views::BubbleDialogDelegateView::CreateBubble(bubble_delegate5));
   bubble_widget5->Show();
 
   EXPECT_TRUE(controller()->IsRevealed());
@@ -989,8 +999,8 @@ TEST_F(ImmersiveFullscreenControllerTest, Bubbles) {
   // handled upon reenabling immersive fullscreen.
   SetEnabled(false);
 
-  views::Widget* bubble_widget6 = views::BubbleDelegateView::CreateBubble(
-      new views::BubbleDelegateView(child_view, views::BubbleBorder::NONE));
+  views::Widget* bubble_widget6 = views::BubbleDialogDelegateView::CreateBubble(
+      new TestBubbleDialogDelegate(child_view));
   bubble_widget6->Show();
 
   SetEnabled(true);
@@ -1001,8 +1011,8 @@ TEST_F(ImmersiveFullscreenControllerTest, Bubbles) {
   // 6) Test that a bubble which is not anchored to a child of the
   // TopContainerView does not trigger a reveal or keep the
   // top-of-window views revealed if they are already revealed.
-  views::Widget* bubble_widget7 = views::BubbleDelegateView::CreateBubble(
-      new views::BubbleDelegateView(unrelated_view, views::BubbleBorder::NONE));
+  views::Widget* bubble_widget7 = views::BubbleDialogDelegateView::CreateBubble(
+      new TestBubbleDialogDelegate(unrelated_view));
   bubble_widget7->Show();
   EXPECT_FALSE(controller()->IsRevealed());
 
@@ -1011,8 +1021,8 @@ TEST_F(ImmersiveFullscreenControllerTest, Bubbles) {
   AttemptReveal(MODALITY_MOUSE);
   EXPECT_TRUE(controller()->IsRevealed());
 
-  views::Widget* bubble_widget8 = views::BubbleDelegateView::CreateBubble(
-      new views::BubbleDelegateView(unrelated_view, views::BubbleBorder::NONE));
+  views::Widget* bubble_widget8 = views::BubbleDialogDelegateView::CreateBubble(
+      new TestBubbleDialogDelegate(unrelated_view));
   bubble_widget8->Show();
   SetHovered(false);
   EXPECT_FALSE(controller()->IsRevealed());