Remove BrowserIterator

chrome/browser/after_startup_task_utils.cc

 // Copyright 2015 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 "chrome/browser/after_startup_task_utils.h"
 
 #include <utility>
 
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/process/process_info.h"
 #include "base/rand_util.h"
 #include "base/synchronization/cancellation_flag.h"
 #include "base/task_runner.h"
 #include "base/tracked_objects.h"
 #include "build/build_config.h"
 #include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/browser_iterator.h"
+#include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 
 using content::BrowserThread;
 using content::WebContents;
 using content::WebContentsObserver;
 using StartupCompleteFlag = base::CancellationFlag;
@@ skipping 124 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(StartupObserver);
 };
 
 void StartupObserver::Start() {
   // Signal completion quickly when there is no first page to load.
   const int kShortDelaySecs = 3;
   base::TimeDelta delay = base::TimeDelta::FromSeconds(kShortDelaySecs);
 
 #if !defined(OS_ANDROID)
   WebContents* contents = nullptr;
-  for (chrome::BrowserIterator iter; !iter.done(); iter.Next()) {
-    contents = (*iter)->tab_strip_model()->GetActiveWebContents();
+  for (auto& browser : *BrowserList::GetInstance()) {

[sky, 2016/01/28 03:04:05]

Does this work? BrowserList::GerInstance() returns a Browser* right? This code
wants to iterate over the browsers, not a single browser.

[scottmg, 2016/01/28 03:09:23]

It's a BrowserList& here. The * is needed in a range-based for loop, as the
contract is that the object has to have a begin() and an end() method, which
when it's a BrowserList* it doesn't have.

+    contents = browser->tab_strip_model()->GetActiveWebContents();
     if (contents && contents->GetMainFrame() &&
         contents->GetMainFrame()->GetVisibilityState() ==
             blink::WebPageVisibilityStateVisible) {
       break;
     }
   }
 
   if (contents) {
     // Give the page time to finish loading.
     const int kLongerDelayMins = 3;
@@ skipping 46 matching lines @@
   return ::IsBrowserStartupComplete();
 }
 
 void AfterStartupTaskUtils::UnsafeResetForTesting() {
   DCHECK(g_after_startup_tasks.Get().empty());
   if (!IsBrowserStartupComplete())
     return;
   g_startup_complete_flag.Get().UnsafeResetForTesting();
   DCHECK(!IsBrowserStartupComplete());
 }