Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5825)

Unified Diff: chrome/browser/ui/browser_browsertest.cc

Issue 1644773003: Remove BrowserIterator (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@host-desktop-1
Patch Set: . Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/browser_finder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser_browsertest.cc
diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc
index 2bb48ceb26d54b9b1f6bf60752c4c7a94a45607c..b1c7107b6e1e7559452f73bf02bb651277d4f3d0 100644
--- a/chrome/browser/ui/browser_browsertest.cc
+++ b/chrome/browser/ui/browser_browsertest.cc
@@ -45,7 +45,7 @@
#include "chrome/browser/ui/browser_command_controller.h"
#include "chrome/browser/ui/browser_commands.h"
#include "chrome/browser/ui/browser_finder.h"
-#include "chrome/browser/ui/browser_iterator.h"
+#include "chrome/browser/ui/browser_list.h"
#include "chrome/browser/ui/browser_tabstrip.h"
#include "chrome/browser/ui/browser_ui_prefs.h"
#include "chrome/browser/ui/browser_window.h"
@@ -1410,9 +1410,9 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, DISABLED_ConvertTabToAppShortcut) {
// Find the new browser.
Browser* app_browser = NULL;
- for (chrome::BrowserIterator it; !it.done() && !app_browser; it.Next()) {
- if (*it != browser())
- app_browser = *it;
+ for (auto* b : *BrowserList::GetInstance()) {
+ if (b != browser())
+ app_browser = b;
}
ASSERT_TRUE(app_browser);
@@ -1590,13 +1590,13 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, ShouldShowLocationBar) {
// Find the new browsers.
Browser* app_browser = NULL;
Browser* dev_tools_browser = NULL;
- for (chrome::BrowserIterator it; !it.done(); it.Next()) {
- if (*it == browser()) {
+ for (auto* b : *BrowserList::GetInstance()) {
+ if (b == browser()) {
continue;
- } else if ((*it)->app_name() == DevToolsWindow::kDevToolsApp) {
- dev_tools_browser = *it;
+ } else if (b->app_name() == DevToolsWindow::kDevToolsApp) {
+ dev_tools_browser = b;
} else {
- app_browser = *it;
+ app_browser = b;
}
}
ASSERT_TRUE(dev_tools_browser);
@@ -1655,9 +1655,9 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, RestorePinnedTabs) {
// Find the new browser.
Browser* new_browser = NULL;
- for (chrome::BrowserIterator it; !it.done() && !new_browser; it.Next()) {
- if (*it != browser())
- new_browser = *it;
+ for (auto* b : *BrowserList::GetInstance()) {
+ if (b != browser())
+ new_browser = b;
}
ASSERT_TRUE(new_browser);
ASSERT_TRUE(new_browser != browser());
@@ -1717,9 +1717,9 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, OpenAppWindowLikeNtp) {
// Find the new browser.
Browser* new_browser = NULL;
- for (chrome::BrowserIterator it; !it.done() && !new_browser; it.Next()) {
- if (*it != browser())
- new_browser = *it;
+ for (auto* b : *BrowserList::GetInstance()) {
+ if (b != browser())
+ new_browser = b;
}
ASSERT_TRUE(new_browser);
ASSERT_TRUE(new_browser != browser());
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/browser_finder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698