MacViews: Fix ViewTest.HandleAccelerator by faking window activation

ui/views/window/dialog_delegate_unittest.cc

 // Copyright 2013 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 "base/strings/utf_string_conversions.h"
 #include "ui/base/hit_test.h"
 #include "ui/events/event_processor.h"
 #include "ui/views/bubble/bubble_border.h"
 #include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/controls/button/checkbox.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_client_view.h"
 #include "ui/views/window/dialog_delegate.h"
 
-#if defined(OS_MACOSX)
-#include "ui/base/test/scoped_fake_nswindow_focus.h"
-#endif
-
 namespace views {
 
 namespace {
 
 class TestDialog : public DialogDelegateView, public ButtonListener {
  public:
   TestDialog()
       : input_(new views::Textfield()),
         canceled_(false),
         accepted_(false),
@@ skipping 61 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(TestDialog);
 };
 
 class DialogTest : public ViewsTestBase {
  public:
   DialogTest() : dialog_(NULL) {}
   ~DialogTest() override {}
 
   void SetUp() override {
     ViewsTestBase::SetUp();
+    EnableMacFakeWindowActivation();
     dialog_ = new TestDialog();
     DialogDelegate::CreateDialogWidget(dialog_, GetContext(), NULL)->Show();
   }
 
   void TearDown() override {
     dialog_->TearDown();
     ViewsTestBase::TearDown();
   }
 
   void SimulateKeyEvent(const ui::KeyEvent& event) {
     ui::KeyEvent event_copy = event;
     if (dialog()->GetFocusManager()->OnKeyEvent(event_copy))
       dialog()->GetWidget()->OnKeyEvent(&event_copy);
   }
 
   TestDialog* dialog() const { return dialog_; }
 
  private:
   TestDialog* dialog_;
 
-#if defined(OS_MACOSX)
-  // Causes Widget::Show() to transfer focus synchronously and become immune to
-  // losing focus to processes running in parallel.
-  ui::test::ScopedFakeNSWindowFocus fake_focus;
-#endif
-
   DISALLOW_COPY_AND_ASSIGN(DialogTest);
 };
 
 }  // namespace
 
 TEST_F(DialogTest, AcceptAndCancel) {
   DialogClientView* client_view = dialog()->GetDialogClientView();
   LabelButton* ok_button = client_view->ok_button();
   LabelButton* cancel_button = client_view->cancel_button();
 
@@ skipping 99 matching lines @@
   dialog2->TearDown();
 }
 
 // Tests default focus is assigned correctly when showing a new dialog.
 TEST_F(DialogTest, InitialFocus) {
   EXPECT_TRUE(dialog()->input()->HasFocus());
   EXPECT_EQ(dialog()->input(), dialog()->GetFocusManager()->GetFocusedView());
 }
 
 }  // namespace views