Update sundry BubbleDelegateView references to BubbleDialogDelegateView

ui/views/widget/native_widget_mac_unittest.mm

Index: ui/views/widget/native_widget_mac_unittest.mm
diff --git a/ui/views/widget/native_widget_mac_unittest.mm b/ui/views/widget/native_widget_mac_unittest.mm
index 73664e585fc6281807a2b9346d8cac30c1b69203..be6781488ca562b748cd68ea2ae870d970c34fed 100644
--- a/ui/views/widget/native_widget_mac_unittest.mm
+++ b/ui/views/widget/native_widget_mac_unittest.mm
@@ -22,7 +22,7 @@
 #import "ui/events/test/cocoa_test_event_utils.h"
 #include "ui/events/test/event_generator.h"
 #import "ui/gfx/mac/coordinate_conversion.h"
-#include "ui/views/bubble/bubble_delegate.h"
+#include "ui/views/bubble/bubble_dialog_delegate.h"
 #import "ui/views/cocoa/bridged_native_widget.h"
 #import "ui/views/cocoa/native_widget_mac_nswindow.h"
 #include "ui/views/controls/button/label_button.h"
@@ -236,6 +236,15 @@ class NativeHostHolder {
   DISALLOW_COPY_AND_ASSIGN(NativeHostHolder);
 };
 
+class SimpleBubbleView : public BubbleDialogDelegateView {

[msw, 2016/04/19 18:14:55]

Why do we need this subclass?

[Evan Stade, 2016/04/19 21:51:31]

the ctor is protected. I'll add a comment.

+ public:
+  SimpleBubbleView() {}
+  ~SimpleBubbleView() override {}
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(SimpleBubbleView);
+};
+
 // Test visibility states triggered externally.
 TEST_F(NativeWidgetMacTest, HideAndShowExternally) {
   Widget* widget = CreateTopLevelPlatformWidget();
@@ -1075,15 +1084,15 @@ TEST_F(NativeWidgetMacTest, NativeProperties) {
   EXPECT_FALSE([dialog_widget->GetNativeWindow() canBecomeMainWindow]);
 
   // Create a bubble widget with a parent: also shouldn't get main.
-  BubbleDelegateView* bubble_view = new BubbleDelegateView();
+  BubbleDialogDelegateView* bubble_view = new SimpleBubbleView();
   bubble_view->set_parent_window(regular_widget->GetNativeView());
-  Widget* bubble_widget = BubbleDelegateView::CreateBubble(bubble_view);
+  Widget* bubble_widget = BubbleDialogDelegateView::CreateBubble(bubble_view);
   EXPECT_TRUE([bubble_widget->GetNativeWindow() canBecomeKeyWindow]);
   EXPECT_FALSE([bubble_widget->GetNativeWindow() canBecomeMainWindow]);
 
   // But a bubble without a parent should still be able to become main.
   Widget* toplevel_bubble_widget =
-      BubbleDelegateView::CreateBubble(new BubbleDelegateView());
+      BubbleDialogDelegateView::CreateBubble(new SimpleBubbleView());
   EXPECT_TRUE([toplevel_bubble_widget->GetNativeWindow() canBecomeKeyWindow]);
   EXPECT_TRUE([toplevel_bubble_widget->GetNativeWindow() canBecomeMainWindow]);