Remove BrowserIterator

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/macros.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_list.h"
 #include "chrome/browser/ui/browser_window.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 {
@@ skipping 119 matching lines @@
 
   // When another app is focused, the menu item for the app should change.
   extensions::AppWindow* app_2_app_window = FirstWindowForApp(app_2_);
   [[NSNotificationCenter defaultCenter]
       postNotificationName:NSWindowDidBecomeMainNotification
                     object:app_2_app_window->GetNativeWindow()];
   CheckHasAppMenus(app_2_);
 
   // When a browser window is focused, the menu items for the app should be
   // removed.
-  BrowserWindow* chrome_window = chrome::BrowserIterator()->window();
+  BrowserWindow* chrome_window =
+      (*BrowserList::GetInstance()->begin())->window();
   [[NSNotificationCenter defaultCenter]
       postNotificationName:NSWindowDidBecomeMainNotification
                     object:chrome_window->GetNativeWindow()];
   CheckNoAppMenus();
 
   // When an app window is closed and there are no other app windows, the menu
   // items for the app should be removed.
   app_1_app_window->GetBaseWindow()->Close();
   chrome_window->Close();
   [[NSNotificationCenter defaultCenter]
@@ skipping 13 matching lines @@
   // Start with app1 active.
   SetUpApps(PACKAGED_1);
   extensions::AppWindow* app_1_app_window = FirstWindowForApp(app_1_);
 
   {
     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();
+    BrowserWindow* chrome_window =
+        (*BrowserList::GetInstance()->begin())->window();
     chrome_window->Close();
     [[NSNotificationCenter defaultCenter]
         postNotificationName:NSWindowWillCloseNotification
                       object:chrome_window->GetNativeWindow()];
     CheckHasAppMenus(app_1_);
 
     // |fake_focus| going out of scope sends NSWindowWillResignMainNotification.
   }
   app_1_app_window->GetBaseWindow()->Close();
   CheckNoAppMenus();
@@ skipping 32 matching lines @@
                     object:FirstWindowForApp(app_1_)->GetNativeWindow()];
   CheckEditMenu(app_1_);
 }
 
 // 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();
+  (*BrowserList::GetInstance()->begin())->window()->Close();
   NSWindow* app_1_window = FirstWindowForApp(app_1_)->GetNativeWindow();
 
   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