Update sundry BubbleDelegateView references to BubbleDialogDelegateView

ui/views/widget/widget_unittest.cc

 // Copyright (c) 2012 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 <algorithm>
 #include <memory>
 #include <set>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/hit_test.h"
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/native_widget_types.h"
-#include "ui/views/bubble/bubble_delegate.h"
+#include "ui/views/bubble/bubble_dialog_delegate.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/test/native_widget_factory.h"
 #include "ui/views/test/test_views.h"
 #include "ui/views/test/test_widget_observer.h"
 #include "ui/views/test/widget_test.h"
 #include "ui/views/widget/native_widget_delegate.h"
 #include "ui/views/widget/native_widget_private.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget_deletion_observer.h"
 #include "ui/views/widget/widget_removals_observer.h"
@@ skipping 25 matching lines @@
   View::ConvertPointToTarget(view->GetWidget()->GetRootView(), view, &tmp);
   return tmp;
 }
 
 // This class can be used as a deleter for std::unique_ptr<Widget>
 // to call function Widget::CloseNow automatically.
 struct WidgetCloser {
   inline void operator()(Widget* widget) const { widget->CloseNow(); }
 };
 
+class SimpleBubbleView : public BubbleDialogDelegateView {

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

ditto q, or why not just use TestBubbleDialogDelegateView?

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

Done.

+ public:
+  SimpleBubbleView(View* anchor)
+      : BubbleDialogDelegateView(anchor, BubbleBorder::NONE) {}
+  ~SimpleBubbleView() override {}
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(SimpleBubbleView);
+};
+
 using WidgetAutoclosePtr = std::unique_ptr<Widget, WidgetCloser>;
 
 }  // namespace
 
 // A view that keeps track of the events it receives, and consumes all scroll
 // gesture events and ui::ET_SCROLL events.
 class ScrollableEventCountView : public EventCountView {
  public:
   ScrollableEventCountView() {}
   ~ScrollableEventCountView() override {}
@@ skipping 748 matching lines @@
   EXPECT_EQ(child1, widget_shown());
 
   child2->Show();
   EXPECT_EQ(child2, widget_shown());
 }
 
 TEST_F(WidgetObserverTest, DestroyBubble) {
   WidgetAutoclosePtr anchor(CreateTopLevelPlatformWidget());
   anchor->Show();
 
-  BubbleDelegateView* bubble_delegate =
-      new BubbleDelegateView(anchor->client_view(), BubbleBorder::NONE);
+  BubbleDialogDelegateView* bubble_delegate =
+      new SimpleBubbleView(anchor->client_view());
   {
     WidgetAutoclosePtr bubble_widget(
-        BubbleDelegateView::CreateBubble(bubble_delegate));
+        BubbleDialogDelegateView::CreateBubble(bubble_delegate));
     bubble_widget->Show();
   }
 
   anchor->Hide();
 }
 
 TEST_F(WidgetObserverTest, WidgetBoundsChanged) {
   WidgetAutoclosePtr child1(NewWidget());
   WidgetAutoclosePtr child2(NewWidget());
 
@@ skipping 360 matching lines @@
       CreatePlatformDesktopNativeWidgetImpl(init_params, &widget, nullptr);
 #endif
   widget.Init(init_params);
   widget.SetContentsView(contents_view);
   widget.Show();
   widget.Activate();
   contents_view->RequestFocus();
   EXPECT_TRUE(contents_view->HasFocus());
 
   // Show a bubble.
-  BubbleDelegateView* bubble_delegate_view =
-      new BubbleDelegateView(contents_view, BubbleBorder::TOP_LEFT);
+  BubbleDialogDelegateView* bubble_delegate_view =
+      new SimpleBubbleView(contents_view);
   bubble_delegate_view->SetFocusable(true);
-  BubbleDelegateView::CreateBubble(bubble_delegate_view)->Show();
+  BubbleDialogDelegateView::CreateBubble(bubble_delegate_view)->Show();
   bubble_delegate_view->RequestFocus();
 
   // |contents_view_| should no longer have focus.
   EXPECT_FALSE(contents_view->HasFocus());
   EXPECT_TRUE(bubble_delegate_view->HasFocus());
 
   bubble_delegate_view->GetWidget()->CloseNow();
 
   // Closing the bubble should result in focus going back to the contents view.
   EXPECT_TRUE(contents_view->HasFocus());
 }
 
-class TestBubbleDelegateView : public BubbleDelegateView {
+class TestBubbleDialogDelegateView : public BubbleDialogDelegateView {
  public:
-  TestBubbleDelegateView(View* anchor)
-      : BubbleDelegateView(anchor, BubbleBorder::NONE),
+  TestBubbleDialogDelegateView(View* anchor)
+      : BubbleDialogDelegateView(anchor, BubbleBorder::NONE),
         reset_controls_called_(false) {}
-  ~TestBubbleDelegateView() override {}
+  ~TestBubbleDialogDelegateView() override {}
 
   bool ShouldShowCloseButton() const override {
     reset_controls_called_ = true;
     return true;
   }
 
   mutable bool reset_controls_called_;
 };
 
 TEST_F(WidgetTest, BubbleControlsResetOnInit) {
   WidgetAutoclosePtr anchor(CreateTopLevelPlatformWidget());
   anchor->Show();
 
   {
-    TestBubbleDelegateView* bubble_delegate =
-        new TestBubbleDelegateView(anchor->client_view());
+    TestBubbleDialogDelegateView* bubble_delegate =
+        new TestBubbleDialogDelegateView(anchor->client_view());
     WidgetAutoclosePtr bubble_widget(
-        BubbleDelegateView::CreateBubble(bubble_delegate));
+        BubbleDialogDelegateView::CreateBubble(bubble_delegate));
     EXPECT_TRUE(bubble_delegate->reset_controls_called_);
     bubble_widget->Show();
   }
 
   anchor->Hide();
 }
 
 #if defined(OS_WIN)
 // Test to ensure that after minimize, view width is set to zero. This is only
 // the case for desktop widgets on Windows. Other platforms retain the window
@@ skipping 2242 matching lines @@
   // Moving the child to a different widget should call the removals observer.
   WidgetAutoclosePtr widget2(CreateTopLevelPlatformWidget());
   widget2->client_view()->AddChildView(child);
   EXPECT_TRUE(removals_observer.DidRemoveView(child));
 
   widget->RemoveRemovalsObserver(&removals_observer);
 }
 
 }  // namespace test
 }  // namespace views