[MacViews] Fix AccessiblePaneViewTest.SetPaneFocusAndRestore.

chrome/browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm

 // 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 "extensions/browser/app_window/native_app_window.h"
 
 #import <Cocoa/Cocoa.h>
 
 #import "base/mac/foundation_util.h"
 #import "base/mac/mac_util.h"
 #import "base/mac/scoped_cftyperef.h"
 #import "base/mac/scoped_nsobject.h"
 #import "base/mac/sdk_forward_declarations.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
 #include "chrome/browser/apps/app_shim/extension_app_shim_handler_mac.h"
 #include "chrome/browser/apps/app_shim/test/app_shim_host_manager_test_api_mac.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/extensions/app_launch_params.h"
 #include "chrome/browser/ui/extensions/application_launch.h"
-#import "chrome/browser/ui/test/scoped_fake_nswindow_main_status.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/test_utils.h"
 #include "extensions/browser/app_window/app_window_registry.h"
 #include "extensions/common/constants.h"
 #include "skia/ext/skia_utils_mac.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #import "testing/gtest_mac.h"
 #import "ui/base/test/nswindow_fullscreen_notification_waiter.h"
+#import "ui/base/test/scoped_fake_nswindow_focus.h"
 #import "ui/base/test/scoped_fake_nswindow_fullscreen.h"
 #import "ui/base/test/windowed_nsnotification_observer.h"
 #import "ui/gfx/mac/nswindow_frame_controls.h"
 
 using extensions::AppWindow;
 using extensions::PlatformAppBrowserTest;
 
 using ::testing::_;
 using ::testing::Invoke;
 using ::testing::Return;
@@ skipping 651 matching lines @@
   // The window is currently inactive so it should be blue (#0000FF).
   NSColor* expected_color = ColorInBitmapColorSpace(0xFF0000FF, bitmap);
   NSColor* color = [bitmap colorAtX:half_width y:5];
   CGFloat expected_components[4], color_components[4];
   [expected_color getComponents:expected_components];
   [color getComponents:color_components];
   EXPECT_NEAR(expected_components[0], color_components[0], 0.01);
   EXPECT_NEAR(expected_components[1], color_components[1], 0.01);
   EXPECT_NEAR(expected_components[2], color_components[2], 0.01);
 
-  ScopedFakeNSWindowMainStatus fake_main(ns_window);
+  ui::test::ScopedFakeNSWindowFocus fake_focus;
+  [ns_window makeMainWindow];
 
   bitmap = ScreenshotNSWindow(ns_window);
   // The window is now active so it should be red (#FF0000).
   expected_color = ColorInBitmapColorSpace(0xFFFF0000, bitmap);
   color = [bitmap colorAtX:half_width y:5];
   [expected_color getComponents:expected_components];
   [color getComponents:color_components];
   EXPECT_NEAR(expected_components[0], color_components[0], 0.01);
   EXPECT_NEAR(expected_components[1], color_components[1], 0.01);
   EXPECT_NEAR(expected_components[2], color_components[2], 0.01);
 }
 
 INSTANTIATE_TEST_CASE_P(NativeAppWindowCocoaBrowserTestInstance,
                         NativeAppWindowCocoaBrowserTest,
                         ::testing::Bool());