Update sundry BubbleDelegateView references to BubbleDialogDelegateView

ui/views/widget/native_widget_mac_unittest.mm

 // Copyright 2014 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.
 
 #import "ui/views/widget/native_widget_mac.h"
 
 #import <Cocoa/Cocoa.h>
 
 #import "base/mac/foundation_util.h"
 #import "base/mac/scoped_nsobject.h"
 #import "base/mac/scoped_objc_class_swizzler.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/test_timeouts.h"
 #import "testing/gtest_mac.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #import "ui/base/cocoa/constrained_window/constrained_window_animation.h"
 #import "ui/base/cocoa/window_size_constants.h"
 #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"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/native/native_view_host.h"
 #include "ui/views/native_cursor.h"
 #include "ui/views/test/native_widget_factory.h"
 #include "ui/views/test/test_widget_observer.h"
 #include "ui/views/test/widget_test.h"
 #include "ui/views/widget/native_widget_mac.h"
@@ skipping 193 matching lines @@
   gfx::NativeView view() const { return view_.get(); }
   NativeViewHost* host() const { return host_.get(); }
 
  private:
   base::scoped_nsobject<NSView> view_;
   std::unique_ptr<NativeViewHost> host_;
 
   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();
   NSWindow* ns_window = widget->GetNativeWindow();
   WidgetChangeObserver observer(widget);
 
   // Should initially be hidden.
   EXPECT_FALSE(widget->IsVisible());
   EXPECT_FALSE([ns_window isVisible]);
   EXPECT_EQ(0, observer.gained_visible_count());
@@ skipping 819 matching lines @@
 
   // Create a dialog widget (also TYPE_WINDOW), but with a DialogDelegate.
   Widget* dialog_widget = views::DialogDelegate::CreateDialogWidget(
       new ModalDialogDelegate(ui::MODAL_TYPE_CHILD), nullptr,
       regular_widget->GetNativeView());
   EXPECT_TRUE([dialog_widget->GetNativeWindow() canBecomeKeyWindow]);
   // Dialogs shouldn't take main status away from their parent.
   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]);
 
   toplevel_bubble_widget->CloseNow();
   regular_widget->CloseNow();
 }
 
 NSData* WindowContentsAsTIFF(NSWindow* window) {
   NSView* frame_view = [[window contentView] superview];
   EXPECT_TRUE(frame_view);
@@ skipping 402 matching lines @@
   lastDirtyRect_ = dirtyRect;
 }
 
 @end
 
 @implementation FocusableTestNSView
 - (BOOL)acceptsFirstResponder {
   return YES;
 }
 @end