[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 31 matching lines @@
                                 extensions::LAUNCH_TYPE_WINDOW);
       LaunchHostedApp(hosted_app_);
     }
 
     initial_menu_item_count_ = [[[NSApp mainMenu] itemArray] count];
   }
 
   void CheckHasAppMenus(const extensions::Extension* app) const {
     const int kExtraTopLevelItems = 4;
     NSArray* item_array = [[NSApp mainMenu] itemArray];
-    EXPECT_EQ(initial_menu_item_count_ + kExtraTopLevelItems,
+    ASSERT_EQ(initial_menu_item_count_ + kExtraTopLevelItems,
               [item_array count]);
     for (NSUInteger i = 0; i < initial_menu_item_count_; ++i)
       EXPECT_TRUE([[item_array objectAtIndex:i] isHidden]);
     NSMenuItem* app_menu = [item_array objectAtIndex:initial_menu_item_count_];
     EXPECT_EQ(app->id(), base::SysNSStringToUTF8([app_menu title]));
     EXPECT_EQ(app->name(),
               base::SysNSStringToUTF8([[app_menu submenu] title]));
     for (NSUInteger i = initial_menu_item_count_;
          i < initial_menu_item_count_ + kExtraTopLevelItems;
          ++i) {
@@ skipping 88 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(
-        app_1_app_window->GetNativeWindow());
-    [[NSNotificationCenter defaultCenter]
-        postNotificationName:NSWindowDidBecomeMainNotification
-                      object:app_1_app_window->GetNativeWindow()];
+    ui::test::ScopedFakeNSWindowFocus fake_focus;
+    [app_1_app_window->GetNativeWindow() makeMainWindow];
     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]
         postNotificationName:NSWindowWillCloseNotification
                       object:chrome_window->GetNativeWindow()];
     CheckHasAppMenus(app_1_);
+
+    // |fake_focus| going out of scope sends NSWindowWillResignMainNotification.
   }
-  [[NSNotificationCenter defaultCenter]
-      postNotificationName:NSWindowDidResignMainNotification
-                    object:app_1_app_window->GetNativeWindow()];
   app_1_app_window->GetBaseWindow()->Close();
   CheckNoAppMenus();
 }
 
 // Test to check that hosted apps have "Find" and "Paste and Match Style" menu
 // items under the "Edit" menu.
 IN_PROC_BROWSER_TEST_F(AppShimMenuControllerBrowserTest,
                        HostedAppHasAdditionalEditMenuItems) {
   SetUpApps(HOSTED | PACKAGED_1);
 
@@ skipping 26 matching lines @@
 }
 
 // Test that uninstalling an app restores the main menu.
 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::ScopedFakeNSWindowFocus fake_focus;
+  [app_1_window makeMainWindow];
 
   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