[MacViews] Fix AccessiblePaneViewTest.SetPaneFocusAndRestore.

chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_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.
 
 #import "chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/command_line.h"
 #import "base/mac/foundation_util.h"
 #import "base/mac/scoped_nsobject.h"
 #import "base/mac/scoped_objc_class_swizzler.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
 #include "chrome/browser/apps/app_shim/extension_app_shim_handler_mac.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/launch_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_iterator.h"
 #include "chrome/browser/ui/browser_window.h"
-#import "chrome/browser/ui/test/scoped_fake_nswindow_main_status.h"
 #include "chrome/common/chrome_switches.h"
 #include "extensions/browser/app_window/app_window_registry.h"
 #include "extensions/browser/app_window/native_app_window.h"
 #include "extensions/browser/uninstall_reason.h"
 #include "extensions/common/extension.h"
 #include "extensions/test/extension_test_message_listener.h"
+#import "ui/base/test/scoped_fake_nswindow_focus.h"
 
 namespace {
 
 class AppShimMenuControllerBrowserTest
     : public extensions::PlatformAppBrowserTest {
  protected:
   // The apps that can be installed and launched by SetUpApps().
   enum AvailableApps { PACKAGED_1 = 0x1, PACKAGED_2 = 0x2, HOSTED = 0x4 };
 
   AppShimMenuControllerBrowserTest()
@@ skipping 140 matching lines @@
 }
 
 // Test that closing windows without main status do not update the menu.
 IN_PROC_BROWSER_TEST_F(AppShimMenuControllerBrowserTest,
                        ClosingBackgroundWindowLeavesMenuBar) {
   // Start with app1 active.
   SetUpApps(PACKAGED_1);
   extensions::AppWindow* app_1_app_window = FirstWindowForApp(app_1_);
 
   {
-    ScopedFakeNSWindowMainStatus app_1_is_main(
+    ui::test::ScopedFakeNSWindowMainStatus app_1_is_main(
         app_1_app_window->GetNativeWindow());
     [[NSNotificationCenter defaultCenter]
         postNotificationName:NSWindowDidBecomeMainNotification
                       object:app_1_app_window->GetNativeWindow()];
     CheckHasAppMenus(app_1_);
 
     // Closing a background window without focusing it should not change menus.
     BrowserWindow* chrome_window = chrome::BrowserIterator()->window();
     chrome_window->Close();
     [[NSNotificationCenter defaultCenter]
@@ skipping 46 matching lines @@
 IN_PROC_BROWSER_TEST_F(AppShimMenuControllerBrowserTest,
                        ExtensionUninstallUpdatesMenuBar) {
   SetUpApps(PACKAGED_1 | PACKAGED_2);
 
   FirstWindowForApp(app_2_)->GetBaseWindow()->Close();
   chrome::BrowserIterator()->window()->Close();
   NSWindow* app_1_window = FirstWindowForApp(app_1_)->GetNativeWindow();
   [[NSNotificationCenter defaultCenter]
       postNotificationName:NSWindowDidBecomeMainNotification
                     object:app_1_window];
-  ScopedFakeNSWindowMainStatus app_1_is_main(app_1_window);
+  ui::test::ScopedFakeNSWindowMainStatus app_1_is_main(app_1_window);
 
   CheckHasAppMenus(app_1_);
   ExtensionService::UninstallExtensionHelper(
       extension_service(),
       app_1_->id(),
       extensions::UNINSTALL_REASON_FOR_TESTING);
 
   // OSX will send NSWindowWillResignMainNotification when a main window is
   // closed.
   [[NSNotificationCenter defaultCenter]
       postNotificationName:NSWindowDidResignMainNotification
                     object:app_1_window];
   CheckNoAppMenus();
 }
 
 }  // namespace