MacViews: Fix ViewTest.HandleAccelerator by faking window activation

ui/views/bubble/bubble_delegate_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 <stddef.h>
 
 #include "base/macros.h"
 #include "ui/base/hit_test.h"
 #include "ui/events/event_utils.h"
 #include "ui/views/bubble/bubble_delegate.h"
 #include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/test/test_widget_observer.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_observer.h"
 
-#if defined(OS_MACOSX)
-#include "ui/base/test/scoped_fake_nswindow_focus.h"
-#endif
-
 namespace views {
 
 namespace {
 
 class TestBubbleDelegateView : public BubbleDelegateView {
  public:
   TestBubbleDelegateView(View* anchor_view)
       : BubbleDelegateView(anchor_view, BubbleBorder::TOP_LEFT),
         view_(new View()) {
     view_->SetFocusable(true);
@@ skipping 30 matching lines @@
 
   // Creates a test widget that owns its native widget.
   Widget* CreateTestWidget() {
     Widget* widget = new Widget();
     Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_WINDOW);
     params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
     widget->Init(params);
     return widget;
   }
 
+  void SetUp() override {
+    ViewsTestBase::SetUp();
+    EnableMacFakeWindowActivation();
+  }
+
  private:
-#if defined(OS_MACOSX)
-  // Ensure tests running in parallel don't steal focus from the Widget on Mac.
-  ui::test::ScopedFakeNSWindowFocus fake_focus_;
-#endif
-
   DISALLOW_COPY_AND_ASSIGN(BubbleDelegateTest);
 };
 
 }  // namespace
 
 TEST_F(BubbleDelegateTest, CreateDelegate) {
   scoped_ptr<Widget> anchor_widget(CreateTestWidget());
   BubbleDelegateView* bubble_delegate = new BubbleDelegateView(
       anchor_widget->GetContentsView(), BubbleBorder::NONE);
   bubble_delegate->set_color(SK_ColorGREEN);
@@ skipping 235 matching lines @@
         close_button,
         ui::MouseEvent(ui::ET_MOUSE_PRESSED, gfx::Point(0, 0), gfx::Point(0, 0),
                        ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE));
     EXPECT_TRUE(bubble_widget->IsClosed());
     EXPECT_EQ(BubbleDelegateView::CloseReason::CLOSE_BUTTON,
               bubble_delegate->close_reason());
   }
 }
 
 }  // namespace views