Remove BrowserIterator

chrome/browser/devtools/remote_debugging_server.cc

 // Copyright (c) 2012 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/devtools/remote_debugging_server.h"
 
 #include <utility>
 
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "base/path_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/history/top_sites_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/browser_iterator.h"
+#include "chrome/browser/ui/browser_list.h"
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/common/chrome_paths.h"
 #include "components/devtools_http_handler/devtools_http_handler.h"
 #include "components/devtools_http_handler/devtools_http_handler_delegate.h"
 #include "components/history/core/browser/top_sites.h"
 #include "components/version_info/version_info.h"
 #include "content/public/browser/devtools_frontend_host.h"
 #include "grit/browser_resources.h"
 #include "net/base/net_errors.h"
 #include "net/socket/tcp_server_socket.h"
@@ skipping 68 matching lines @@
 };
 
 ChromeDevToolsHttpHandlerDelegate::ChromeDevToolsHttpHandlerDelegate() {
 }
 
 ChromeDevToolsHttpHandlerDelegate::~ChromeDevToolsHttpHandlerDelegate() {
 }
 
 std::string ChromeDevToolsHttpHandlerDelegate::GetDiscoveryPageHTML() {
   std::set<Profile*> profiles;
-  for (chrome::BrowserIterator it; !it.done(); it.Next())
-    profiles.insert((*it)->profile());
+  for (auto& browser : *BrowserList::GetInstance())
+    profiles.insert(browser->profile());
 
   for (std::set<Profile*>::iterator it = profiles.begin();
        it != profiles.end(); ++it) {
     scoped_refptr<history::TopSites> ts = TopSitesFactory::GetForProfile(*it);
     if (ts) {
       // TopSites updates itself after a delay. Ask TopSites to update itself
       // when we're about to show the remote debugging landing page.
       ts->SyncWithHistory();
     }
   }
   return ResourceBundle::GetSharedInstance().GetRawDataResource(
       IDR_DEVTOOLS_DISCOVERY_PAGE_HTML).as_string();
 }
 
 std::string ChromeDevToolsHttpHandlerDelegate::GetFrontendResource(
     const std::string& path) {
   return content::DevToolsFrontendHost::GetFrontendResource(path).as_string();
 }
 
 std::string ChromeDevToolsHttpHandlerDelegate::GetPageThumbnailData(
     const GURL& url) {
-  for (chrome::BrowserIterator it; !it.done(); it.Next()) {
-    Profile* profile = (*it)->profile();
+  for (auto& browser : *BrowserList::GetInstance()) {
+    Profile* profile = browser->profile();
     scoped_refptr<history::TopSites> top_sites =
         TopSitesFactory::GetForProfile(profile);
     if (!top_sites)
       continue;
     scoped_refptr<base::RefCountedMemory> data;
     if (top_sites->GetPageThumbnail(url, false, &data))
       return std::string(data->front_as<char>(), data->size());
   }
   return std::string();
 }
@@ skipping 37 matching lines @@
       debug_frontend_dir,
       version_info::GetProductNameAndVersionForUserAgent(),
       ::GetUserAgent()));
 }
 
 RemoteDebuggingServer::~RemoteDebuggingServer() {
   // Ensure Profile is alive, because the whole DevTools subsystem
   // accesses it during shutdown.
   DCHECK(g_browser_process->profile_manager());
 }