cleanup: make WidgetClosingObserver as test support

chrome/browser/ui/views/first_run_bubble_unittest.cc

Index: chrome/browser/ui/views/first_run_bubble_unittest.cc
diff --git a/chrome/browser/ui/views/first_run_bubble_unittest.cc b/chrome/browser/ui/views/first_run_bubble_unittest.cc
index c3b0addebc8fbba47bb50ac772b88ed4f328bf77..91c4bd0c12fd3e70ca830245ea579ae80395444d 100644
--- a/chrome/browser/ui/views/first_run_bubble_unittest.cc
+++ b/chrome/browser/ui/views/first_run_bubble_unittest.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/first_run_bubble.h"
+
 #include "base/macros.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/views/harmony/chrome_layout_provider.h"
@@ -17,44 +18,11 @@
 #include "ui/events/event_sink.h"
 #include "ui/events/event_utils.h"
 #include "ui/views/test/views_test_base.h"
+#include "ui/views/test/widget_test.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
-// Provides functionality to observe the widget passed in the constructor for
-// the widget closing event.
-class WidgetClosingObserver : public views::WidgetObserver {
- public:
-  explicit WidgetClosingObserver(views::Widget* widget)
-      : widget_(widget),
-        widget_destroyed_(false) {
-    widget_->AddObserver(this);
-  }
-
-  ~WidgetClosingObserver() override {
-    if (widget_)
-      widget_->RemoveObserver(this);
-  }
-
-  void OnWidgetClosing(views::Widget* widget) override {
-    DCHECK(widget == widget_);
-    widget_->RemoveObserver(this);
-    widget_destroyed_ = true;
-    widget_ = nullptr;
-  }
-
-  bool widget_destroyed() const {
-    return widget_destroyed_;
-  }
-
- private:
-  views::Widget* widget_;
-  bool widget_destroyed_;
-
-  DISALLOW_COPY_AND_ASSIGN(WidgetClosingObserver);
-};
-
-class FirstRunBubbleTest : public views::ViewsTestBase,
-                           views::WidgetObserver {
+class FirstRunBubbleTest : public views::ViewsTestBase {
  public:
   FirstRunBubbleTest();
   ~FirstRunBubbleTest() override;
@@ -98,27 +66,26 @@ void FirstRunBubbleTest::CreateAndCloseBubbleOnEventTest(ui::Event* event) {
   views::Widget::InitParams params =
       CreateParams(views::Widget::InitParams::TYPE_WINDOW);
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
-  std::unique_ptr<views::Widget> anchor_widget(new views::Widget);
-  anchor_widget->Init(params);
-  anchor_widget->SetBounds(gfx::Rect(10, 10, 500, 500));
-  anchor_widget->Show();
+  views::Widget anchor_widget;
+  anchor_widget.Init(params);
+  anchor_widget.SetBounds(gfx::Rect(10, 10, 500, 500));
+  anchor_widget.Show();
 
   FirstRunBubble* delegate =
-      FirstRunBubble::ShowBubble(NULL, anchor_widget->GetContentsView());
-  EXPECT_TRUE(delegate != NULL);
+      FirstRunBubble::ShowBubble(nullptr, anchor_widget.GetContentsView());
+  EXPECT_TRUE(delegate);
 
-  anchor_widget->GetContentsView()->RequestFocus();
+  anchor_widget.GetContentsView()->RequestFocus();
 
-  std::unique_ptr<WidgetClosingObserver> widget_observer(
-      new WidgetClosingObserver(delegate->GetWidget()));
+  views::test::WidgetClosingObserver widget_observer(delegate->GetWidget());
 
-  ui::EventDispatchDetails details = anchor_widget->GetNativeWindow()
+  ui::EventDispatchDetails details = anchor_widget.GetNativeWindow()
                                          ->GetHost()
                                          ->event_sink()
                                          ->OnEventFromSource(event);
   EXPECT_FALSE(details.dispatcher_destroyed);
 
-  EXPECT_TRUE(widget_observer->widget_destroyed());
+  EXPECT_TRUE(widget_observer.widget_closed());
 }
 
 TEST_F(FirstRunBubbleTest, CreateAndClose) {
@@ -126,13 +93,13 @@ TEST_F(FirstRunBubbleTest, CreateAndClose) {
   views::Widget::InitParams params =
       CreateParams(views::Widget::InitParams::TYPE_WINDOW);
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
-  std::unique_ptr<views::Widget> anchor_widget(new views::Widget);
-  anchor_widget->Init(params);
-  anchor_widget->Show();
+  views::Widget anchor_widget;
+  anchor_widget.Init(params);
+  anchor_widget.Show();
 
   FirstRunBubble* delegate =
-      FirstRunBubble::ShowBubble(NULL, anchor_widget->GetContentsView());
-  EXPECT_TRUE(delegate != NULL);
+      FirstRunBubble::ShowBubble(nullptr, anchor_widget.GetContentsView());
+  EXPECT_TRUE(delegate);
   delegate->GetWidget()->CloseNow();
 }