summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/extensions/api/management/management_apitest.cc6
-rw-r--r--chrome/browser/extensions/window_open_apitest.cc15
-rw-r--r--chrome/browser/fast_shutdown_browsertest.cc9
-rw-r--r--chrome/browser/sessions/better_session_restore_browsertest.cc14
-rw-r--r--chrome/browser/sessions/session_restore_browsertest.cc45
-rw-r--r--chrome/browser/sessions/tab_restore_browsertest.cc42
-rw-r--r--chrome/browser/ui/browser_browsertest.cc29
-rw-r--r--chrome/browser/ui/browser_close_browsertest.cc29
-rw-r--r--chrome/browser/ui/startup/startup_browser_creator_browsertest.cc15
9 files changed, 104 insertions, 100 deletions
diff --git a/chrome/browser/extensions/api/management/management_apitest.cc b/chrome/browser/extensions/api/management/management_apitest.cc
index 707ef65..45922ad 100644
--- a/chrome/browser/extensions/api/management/management_apitest.cc
+++ b/chrome/browser/extensions/api/management/management_apitest.cc
@@ -13,7 +13,7 @@
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_commands.h"
#include "chrome/browser/ui/browser_finder.h"
-#include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/browser_iterator.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/chrome_switches.h"
@@ -28,13 +28,11 @@ namespace {
// Find a browser other than |browser|.
Browser* FindOtherBrowser(Browser* browser) {
Browser* found = NULL;
- for (BrowserList::const_iterator it = BrowserList::begin();
- it != BrowserList::end(); ++it) {
+ for (chrome::BrowserIterator it; !it.done(); it.Next()) {
if (*it == browser)
continue;
found = *it;
}
-
return found;
}
diff --git a/chrome/browser/extensions/window_open_apitest.cc b/chrome/browser/extensions/window_open_apitest.cc
index 244c0b9..cac1d4c 100644
--- a/chrome/browser/extensions/window_open_apitest.cc
+++ b/chrome/browser/extensions/window_open_apitest.cc
@@ -12,7 +12,7 @@
#include "chrome/browser/extensions/extension_test_message_listener.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_finder.h"
-#include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/browser_iterator.h"
#include "chrome/browser/ui/browser_tabstrip.h"
#include "chrome/browser/ui/panels/panel_manager.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
@@ -23,8 +23,8 @@
#include "content/public/browser/web_contents.h"
#include "content/public/common/result_codes.h"
#include "content/public/test/browser_test_utils.h"
-#include "testing/gtest/include/gtest/gtest.h"
#include "net/base/mock_host_resolver.h"
+#include "testing/gtest/include/gtest/gtest.h"
using content::OpenURLParams;
using content::Referrer;
@@ -68,8 +68,7 @@ void WaitForTabsAndPopups(Browser* browser,
EXPECT_EQ(num_panels, PanelManager::GetInstance()->num_panels());
int num_popups_seen = 0;
- for (BrowserList::const_iterator iter = BrowserList::begin();
- iter != BrowserList::end(); ++iter) {
+ for (chrome::BrowserIterator iter; !iter.done(); iter.Next()) {
if (*iter == browser)
continue;
@@ -83,7 +82,6 @@ void WaitForTabsAndPopups(Browser* browser,
EXPECT_TRUE((*iter)->is_type_popup());
#endif
++num_popups_seen;
-
}
EXPECT_EQ(num_popups, num_popups_seen);
}
@@ -96,12 +94,11 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, BrowserIsApp) {
WaitForTabsAndPopups(browser(), 0, 2, 0);
- for (BrowserList::const_iterator iter = BrowserList::begin();
- iter != BrowserList::end(); ++iter) {
+ for (chrome::BrowserIterator iter; !iter.done(); iter.Next()) {
if (*iter == browser())
- ASSERT_FALSE((*iter)->is_app());
+ ASSERT_FALSE(iter->is_app());
else
- ASSERT_TRUE((*iter)->is_app());
+ ASSERT_TRUE(iter->is_app());
}
}
diff --git a/chrome/browser/fast_shutdown_browsertest.cc b/chrome/browser/fast_shutdown_browsertest.cc
index bab4848..f4d5498 100644
--- a/chrome/browser/fast_shutdown_browsertest.cc
+++ b/chrome/browser/fast_shutdown_browsertest.cc
@@ -8,10 +8,11 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_commands.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 "chrome/common/chrome_switches.h"
#include "chrome/common/chrome_notification_types.h"
+#include "chrome/common/chrome_switches.h"
#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/ui_test_utils.h"
#include "content/public/browser/browser_thread.h"
@@ -54,9 +55,9 @@ IN_PROC_BROWSER_TEST_F(FastShutdown, DISABLED_SlowTermination) {
// Close the new window, removing the one and only beforeunload handler.
ASSERT_EQ(2u, BrowserList::size());
- BrowserList::const_iterator i = BrowserList::begin();
- ++i;
- chrome::CloseWindow(*i);
+ chrome::BrowserIterator it;
+ it.Next();
+ chrome::CloseWindow(*it);
// Need to wait for the renderer process to shutdown to ensure that we got the
// set cookies IPC.
diff --git a/chrome/browser/sessions/better_session_restore_browsertest.cc b/chrome/browser/sessions/better_session_restore_browsertest.cc
index 7d0ef4e..748db0f 100644
--- a/chrome/browser/sessions/better_session_restore_browsertest.cc
+++ b/chrome/browser/sessions/better_session_restore_browsertest.cc
@@ -22,7 +22,7 @@
#include "chrome/browser/sessions/session_service_factory.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_commands.h"
-#include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/browser_iterator.h"
#include "chrome/browser/ui/browser_window.h"
#include "chrome/browser/ui/startup/startup_browser_creator.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
@@ -46,10 +46,9 @@ namespace {
Browser* FindOneOtherBrowserForProfile(Profile* profile,
Browser* not_this_browser) {
- for (BrowserList::const_iterator i = BrowserList::begin();
- i != BrowserList::end(); ++i) {
- if (*i != not_this_browser && (*i)->profile() == profile)
- return *i;
+ for (chrome::BrowserIterator it; !it.done(); it.Next()) {
+ if (*it != not_this_browser && it->profile() == profile)
+ return *it;
}
return NULL;
}
@@ -369,9 +368,8 @@ class RestartTest : public BetterSessionRestoreTest {
protected:
void Restart() {
// Simluate restarting the browser, but let the test exit peacefully.
- BrowserList::const_iterator it;
- for (it = BrowserList::begin(); it != BrowserList::end(); ++it)
- content::BrowserContext::SaveSessionState((*it)->profile());
+ for (chrome::BrowserIterator it; !it.done(); it.Next())
+ content::BrowserContext::SaveSessionState(it->profile());
PrefService* pref_service = g_browser_process->local_state();
pref_service->SetBoolean(prefs::kWasRestarted, true);
#if defined(OS_WIN)
diff --git a/chrome/browser/sessions/session_restore_browsertest.cc b/chrome/browser/sessions/session_restore_browsertest.cc
index aac37fc..db1b87a 100644
--- a/chrome/browser/sessions/session_restore_browsertest.cc
+++ b/chrome/browser/sessions/session_restore_browsertest.cc
@@ -21,7 +21,7 @@
#include "chrome/browser/sessions/tab_restore_service_factory.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_commands.h"
-#include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/browser_list_impl.h"
#include "chrome/browser/ui/browser_tabstrip.h"
#include "chrome/browser/ui/browser_window.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
@@ -45,6 +45,12 @@
#endif
class SessionRestoreTest : public InProcessBrowserTest {
+ public:
+ SessionRestoreTest()
+ : native_browser_list(chrome::BrowserListImpl::GetInstance(
+ chrome::HOST_DESKTOP_TYPE_NATIVE)) {
+ }
+
protected:
#if defined(OS_CHROMEOS)
virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
@@ -141,7 +147,7 @@ class SessionRestoreTest : public InProcessBrowserTest {
}
void AssertOneWindowWithOneTab(Browser* browser) {
- ASSERT_EQ(1u, BrowserList::size());
+ ASSERT_EQ(1u, native_browser_list->size());
ASSERT_EQ(1, browser->tab_strip_model()->count());
}
@@ -160,6 +166,9 @@ class SessionRestoreTest : public InProcessBrowserTest {
GURL url1_;
GURL url2_;
GURL url3_;
+
+ // The SessionRestore browser tests only uses the native desktop for now.
+ const chrome::BrowserListImpl* native_browser_list;
};
#if defined(OS_CHROMEOS)
@@ -533,7 +542,7 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, RestoreForeignSession) {
profile, browser()->host_desktop_type(), session.begin(), session.end());
Browser* new_browser = window_observer.WaitForSingleNewBrowser();
ASSERT_TRUE(new_browser);
- ASSERT_EQ(2u, BrowserList::size());
+ ASSERT_EQ(2u, native_browser_list->size());
ASSERT_EQ(2, new_browser->tab_strip_model()->count());
content::WebContents* web_contents_1 =
@@ -566,7 +575,7 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, Basic) {
ui_test_utils::NavigateToURL(browser(), url2_);
Browser* new_browser = QuitBrowserAndRestore(browser(), 1);
- ASSERT_EQ(1u, BrowserList::size());
+ ASSERT_EQ(1u, native_browser_list->size());
ASSERT_EQ(url2_,
new_browser->tab_strip_model()->GetActiveWebContents()->GetURL());
GoBack(new_browser);
@@ -581,7 +590,7 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, RestoresForwardAndBackwardNavs) {
GoBack(browser());
Browser* new_browser = QuitBrowserAndRestore(browser(), 1);
- ASSERT_EQ(1u, BrowserList::size());
+ ASSERT_EQ(1u, native_browser_list->size());
ASSERT_EQ(url2_,
new_browser->tab_strip_model()->GetActiveWebContents()->GetURL());
GoForward(new_browser);
@@ -614,7 +623,7 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest,
GoBack(browser());
Browser* new_browser = QuitBrowserAndRestore(browser(), 1);
- ASSERT_EQ(1u, BrowserList::size());
+ ASSERT_EQ(1u, native_browser_list->size());
ASSERT_EQ(1, new_browser->tab_strip_model()->count());
// Check that back and forward work as expected.
@@ -645,7 +654,7 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, TwoTabsSecondSelected) {
Browser* new_browser = QuitBrowserAndRestore(browser(), 2);
- ASSERT_EQ(1u, BrowserList::size());
+ ASSERT_EQ(1u, native_browser_list->size());
ASSERT_EQ(2, new_browser->tab_strip_model()->count());
ASSERT_EQ(1, new_browser->tab_strip_model()->active_index());
ASSERT_EQ(url2_,
@@ -686,7 +695,7 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, NormalAndPopup) {
Browser::CreateParams(Browser::TYPE_POPUP, browser()->profile(),
browser()->host_desktop_type()));
popup->window()->Show();
- ASSERT_EQ(2u, BrowserList::size());
+ ASSERT_EQ(2u, native_browser_list->size());
ui_test_utils::NavigateToURL(popup, url1_);
@@ -698,10 +707,10 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, NormalAndPopup) {
// Restart and make sure we have two windows.
QuitBrowserAndRestore(browser(), 1);
- ASSERT_EQ(2u, BrowserList::size());
+ ASSERT_EQ(2u, native_browser_list->size());
- Browser* browser1 = *BrowserList::begin();
- Browser* browser2 = *(++BrowserList::begin());
+ Browser* browser1 = native_browser_list->get(0);
+ Browser* browser2 = native_browser_list->get(1);
Browser::Type type1 = browser1->type();
Browser::Type type2 = browser2->type();
@@ -737,7 +746,7 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest,
base::LaunchProcess(app_launch_arguments, base::LaunchOptions(), NULL);
Browser* app_window = window_observer.WaitForSingleNewBrowser();
- ASSERT_EQ(2u, BrowserList::size());
+ ASSERT_EQ(2u, native_browser_list->size());
// Close the first window. The only window left is the App window.
CloseBrowserSynchronously(browser());
@@ -762,10 +771,10 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, TwoWindowsCloseOneRestoreOnlyOne) {
browser(), GURL(chrome::kAboutBlankURL), NEW_WINDOW,
ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER);
- ASSERT_EQ(2u, BrowserList::size());
+ ASSERT_EQ(2u, native_browser_list->size());
// Close it.
- Browser* new_window = *(++BrowserList::begin());
+ Browser* new_window = native_browser_list->get(1);
CloseBrowserSynchronously(new_window);
// Restart and make sure we have only one window with one tab and the url
@@ -824,7 +833,7 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, PersistAndRestoreUserAgentOverride) {
// Kill the original browser then open a new one to trigger a restore.
Browser* new_browser = QuitBrowserAndRestore(browser(), 1);
- ASSERT_EQ(1u, BrowserList::size());
+ ASSERT_EQ(1u, native_browser_list->size());
ASSERT_EQ(2, new_browser->tab_strip_model()->count());
ASSERT_EQ(1, new_browser->tab_strip_model()->active_index());
@@ -858,7 +867,7 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, RestorePinnedSelectedTab) {
// This will also initiate a session restore, but we're not interested in it.
Browser* new_browser = QuitBrowserAndRestore(browser(), 1);
- ASSERT_EQ(1u, BrowserList::size());
+ ASSERT_EQ(1u, native_browser_list->size());
ASSERT_EQ(2, new_browser->tab_strip_model()->count());
ASSERT_EQ(0, new_browser->tab_strip_model()->active_index());
// Close the pinned tab.
@@ -893,7 +902,7 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, SessionStorage) {
std::string session_storage_persistent_id =
controller->GetDefaultSessionStorageNamespace()->persistent_id();
Browser* new_browser = QuitBrowserAndRestore(browser(), 1);
- ASSERT_EQ(1u, BrowserList::size());
+ ASSERT_EQ(1u, native_browser_list->size());
ASSERT_EQ(url1_,
new_browser->tab_strip_model()->GetActiveWebContents()->GetURL());
content::NavigationController* new_controller =
@@ -938,6 +947,6 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, SessionStorageAfterTabReplace) {
// Quit and restore. Check that no extra tabs were created.
Browser* new_browser = QuitBrowserAndRestore(browser(), 1);
- ASSERT_EQ(1u, BrowserList::size());
+ ASSERT_EQ(1u, native_browser_list->size());
EXPECT_EQ(1, new_browser->tab_strip_model()->count());
}
diff --git a/chrome/browser/sessions/tab_restore_browsertest.cc b/chrome/browser/sessions/tab_restore_browsertest.cc
index efce48d..a59105a 100644
--- a/chrome/browser/sessions/tab_restore_browsertest.cc
+++ b/chrome/browser/sessions/tab_restore_browsertest.cc
@@ -10,7 +10,7 @@
#include "chrome/app/chrome_command_ids.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_commands.h"
-#include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/browser_list_impl.h"
#include "chrome/browser/ui/browser_tabstrip.h"
#include "chrome/browser/ui/find_bar/find_notification_details.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
@@ -33,7 +33,9 @@
class TabRestoreTest : public InProcessBrowserTest {
public:
- TabRestoreTest() : InProcessBrowserTest() {
+ TabRestoreTest()
+ : native_browser_list(chrome::BrowserListImpl::GetInstance(
+ chrome::HOST_DESKTOP_TYPE_NATIVE)) {
url1_ = ui_test_utils::GetTestUrl(
base::FilePath().AppendASCII("session_history"),
base::FilePath().AppendASCII("bot1.html"));
@@ -44,8 +46,9 @@ class TabRestoreTest : public InProcessBrowserTest {
protected:
Browser* GetBrowser(int index) {
- CHECK(static_cast<int>(BrowserList::size()) > index);
- return *(BrowserList::begin() + index);
+
+ CHECK(static_cast<int>(native_browser_list->size()) > index);
+ return native_browser_list->get(index);
}
// Adds tabs to the given browser, all navigated to url1_. Returns
@@ -80,14 +83,14 @@ class TabRestoreTest : public InProcessBrowserTest {
// window (since the index is 0-based).
void RestoreTab(int expected_window_index,
int expected_tabstrip_index) {
- int window_count = static_cast<int>(BrowserList::size());
+ int window_count = static_cast<int>(native_browser_list->size());
ASSERT_GT(window_count, 0);
bool expect_new_window = (expected_window_index == window_count);
Browser* browser;
if (expect_new_window) {
- browser = *(BrowserList::begin());
+ browser = native_browser_list->get(0);
} else {
browser = GetBrowser(expected_window_index);
}
@@ -106,7 +109,7 @@ class TabRestoreTest : public InProcessBrowserTest {
tab_loaded_observer.Wait();
if (expect_new_window) {
- int new_window_count = static_cast<int>(BrowserList::size());
+ int new_window_count = static_cast<int>(native_browser_list->size());
EXPECT_EQ(++window_count, new_window_count);
browser = GetBrowser(expected_window_index);
} else {
@@ -144,6 +147,9 @@ class TabRestoreTest : public InProcessBrowserTest {
GURL url1_;
GURL url2_;
+ // The TabRestore browser tests only uses the native desktop for now.
+ const chrome::BrowserListImpl* native_browser_list;
+
private:
DISALLOW_COPY_AND_ASSIGN(TabRestoreTest);
};
@@ -202,7 +208,7 @@ IN_PROC_BROWSER_TEST_F(TabRestoreTest, RestoreToDifferentWindow) {
ui_test_utils::NavigateToURLWithDisposition(
browser(), GURL(chrome::kChromeUINewTabURL), NEW_WINDOW,
ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER);
- EXPECT_EQ(2u, BrowserList::size());
+ EXPECT_EQ(2u, native_browser_list->size());
// Restore tab into original browser.
ASSERT_NO_FATAL_FAILURE(RestoreTab(0, closed_tab_index));
@@ -226,7 +232,7 @@ IN_PROC_BROWSER_TEST_F(TabRestoreTest, DISABLED_BasicRestoreFromClosedWindow) {
ui_test_utils::NavigateToURLWithDisposition(
browser(), GURL(chrome::kChromeUINewTabURL), NEW_WINDOW,
ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER);
- EXPECT_EQ(2u, BrowserList::size());
+ EXPECT_EQ(2u, native_browser_list->size());
// Close the final tab in the first browser.
content::WindowedNotificationObserver window_observer(
@@ -288,7 +294,7 @@ IN_PROC_BROWSER_TEST_F(TabRestoreTest, RestoreWindowAndTab) {
ui_test_utils::NavigateToURLWithDisposition(
browser(), GURL(chrome::kChromeUINewTabURL), NEW_WINDOW,
ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER);
- EXPECT_EQ(2u, BrowserList::size());
+ EXPECT_EQ(2u, native_browser_list->size());
// Close the first browser.
content::WindowedNotificationObserver observer(
@@ -296,7 +302,7 @@ IN_PROC_BROWSER_TEST_F(TabRestoreTest, RestoreWindowAndTab) {
content::NotificationService::AllSources());
chrome::CloseWindow(browser());
observer.Wait();
- EXPECT_EQ(1u, BrowserList::size());
+ EXPECT_EQ(1u, native_browser_list->size());
// Restore the first window. The expected_tabstrip_index (second argument)
// indicates the expected active tab.
@@ -326,7 +332,7 @@ IN_PROC_BROWSER_TEST_F(TabRestoreTest, RestoreIntoSameWindow) {
ui_test_utils::NavigateToURLWithDisposition(
browser(), GURL(chrome::kChromeUINewTabURL), NEW_WINDOW,
ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER);
- EXPECT_EQ(2u, BrowserList::size());
+ EXPECT_EQ(2u, native_browser_list->size());
// Close all but one tab in the first browser, left to right.
while (browser()->tab_strip_model()->count() > 1)
@@ -338,7 +344,7 @@ IN_PROC_BROWSER_TEST_F(TabRestoreTest, RestoreIntoSameWindow) {
content::NotificationService::AllSources());
CloseTab(0);
observer.Wait();
- EXPECT_EQ(1u, BrowserList::size());
+ EXPECT_EQ(1u, native_browser_list->size());
// Restore the last-closed tab into a new window.
ASSERT_NO_FATAL_FAILURE(RestoreTab(1, 0));
@@ -463,11 +469,11 @@ IN_PROC_BROWSER_TEST_F(TabRestoreTest,
IN_PROC_BROWSER_TEST_F(TabRestoreTest, RestoreWindow) {
// Create a new window.
- size_t window_count = BrowserList::size();
+ size_t window_count = native_browser_list->size();
ui_test_utils::NavigateToURLWithDisposition(
browser(), GURL(chrome::kChromeUINewTabURL), NEW_WINDOW,
ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER);
- EXPECT_EQ(++window_count, BrowserList::size());
+ EXPECT_EQ(++window_count, native_browser_list->size());
// Create two more tabs, one with url1, the other url2.
int initial_tab_count = browser()->tab_strip_model()->count();
@@ -484,7 +490,7 @@ IN_PROC_BROWSER_TEST_F(TabRestoreTest, RestoreWindow) {
content::NotificationService::AllSources());
chrome::CloseWindow(browser());
close_window_observer.Wait();
- EXPECT_EQ(window_count - 1, BrowserList::size());
+ EXPECT_EQ(window_count - 1, native_browser_list->size());
// Restore the window.
content::WindowedNotificationObserver open_window_observer(
@@ -493,9 +499,9 @@ IN_PROC_BROWSER_TEST_F(TabRestoreTest, RestoreWindow) {
content::WindowedNotificationObserver load_stop_observer(
content::NOTIFICATION_LOAD_STOP,
content::NotificationService::AllSources());
- chrome::RestoreTab(*BrowserList::begin());
+ chrome::RestoreTab(native_browser_list->get(0));
open_window_observer.Wait();
- EXPECT_EQ(window_count, BrowserList::size());
+ EXPECT_EQ(window_count, native_browser_list->size());
Browser* browser = GetBrowser(1);
EXPECT_EQ(initial_tab_count + 2, browser->tab_strip_model()->count());
diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc
index 5823298..6d7a8e3 100644
--- a/chrome/browser/ui/browser_browsertest.cc
+++ b/chrome/browser/ui/browser_browsertest.cc
@@ -32,6 +32,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_navigator.h"
#include "chrome/browser/ui/browser_tabstrip.h"
@@ -801,10 +802,9 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, DISABLED_ConvertTabToAppShortcut) {
// Find the new browser.
Browser* app_browser = NULL;
- for (BrowserList::const_iterator i = BrowserList::begin();
- i != BrowserList::end() && !app_browser; ++i) {
- if (*i != browser())
- app_browser = *i;
+ for (chrome::BrowserIterator it; !it.done() && !app_browser; it.Next()) {
+ if (*it != browser())
+ app_browser = *it;
}
ASSERT_TRUE(app_browser);
@@ -937,10 +937,9 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, AppIdSwitch) {
// Find the new browser.
Browser* new_browser = NULL;
- for (BrowserList::const_iterator i = BrowserList::begin();
- i != BrowserList::end() && !new_browser; ++i) {
- if (*i != browser())
- new_browser = *i;
+ for (chrome::BrowserIterator it; !it.done() && !new_browser; it.Next()) {
+ if (*it != browser())
+ new_browser = *it;
}
ASSERT_TRUE(new_browser);
ASSERT_TRUE(new_browser != browser());
@@ -1045,10 +1044,9 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, RestorePinnedTabs) {
// Find the new browser.
Browser* new_browser = NULL;
- for (BrowserList::const_iterator i = BrowserList::begin();
- i != BrowserList::end() && !new_browser; ++i) {
- if (*i != browser())
- new_browser = *i;
+ for (chrome::BrowserIterator it; !it.done() && !new_browser; it.Next()) {
+ if (*it != browser())
+ new_browser = *it;
}
ASSERT_TRUE(new_browser);
ASSERT_TRUE(new_browser != browser());
@@ -1114,10 +1112,9 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, OpenAppWindowLikeNtp) {
// Find the new browser.
Browser* new_browser = NULL;
- for (BrowserList::const_iterator i = BrowserList::begin();
- i != BrowserList::end() && !new_browser; ++i) {
- if (*i != browser())
- new_browser = *i;
+ for (chrome::BrowserIterator it; !it.done() && !new_browser; it.Next()) {
+ if (*it != browser())
+ new_browser = *it;
}
ASSERT_TRUE(new_browser);
ASSERT_TRUE(new_browser != browser());
diff --git a/chrome/browser/ui/browser_close_browsertest.cc b/chrome/browser/ui/browser_close_browsertest.cc
index 431440c..a2b0a9a 100644
--- a/chrome/browser/ui/browser_close_browsertest.cc
+++ b/chrome/browser/ui/browser_close_browsertest.cc
@@ -15,7 +15,7 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/browser_iterator.h"
#include "chrome/browser/ui/browser_tabstrip.h"
#include "chrome/browser/ui/browser_window.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
@@ -211,20 +211,19 @@ class BrowserCloseTest : public InProcessBrowserTest {
int TotalUnclosedBrowsers() {
int count = 0;
- for (BrowserList::const_iterator iter = BrowserList::begin();
- iter != BrowserList::end(); ++iter)
- if (!(*iter)->IsAttemptingToCloseBrowser()) {
+ for (chrome::BrowserIterator it; !it.done(); it.Next()) {
+ if (!it->IsAttemptingToCloseBrowser())
count++;
- }
+ }
return count;
}
// Note that this is invalid to call if TotalUnclosedBrowsers() == 0.
Browser* FirstUnclosedBrowser() {
- for (BrowserList::const_iterator iter = BrowserList::begin();
- iter != BrowserList::end(); ++iter)
- if (!(*iter)->IsAttemptingToCloseBrowser())
- return (*iter);
+ for (chrome::BrowserIterator it; !it.done(); it.Next()) {
+ if (!it->IsAttemptingToCloseBrowser())
+ return *it;
+ }
return NULL;
}
@@ -360,13 +359,13 @@ class BrowserCloseTest : public InProcessBrowserTest {
// Create a new main window and kill everything else.
entry_browser = CreateBrowserOnProfile(first_profile_);
- for (BrowserList::const_iterator bit = BrowserList::begin();
- bit != BrowserList::end(); ++bit) {
- if ((*bit) != entry_browser) {
- EXPECT_TRUE((*bit)->window());
- if (!(*bit)->window())
+ for (chrome::BrowserIterator it; !it.done(); it.Next()) {
+ if ((*it) != entry_browser) {
+ if (!it->window()) {
+ ADD_FAILURE();
return false;
- (*bit)->window()->Close();
+ }
+ it->window()->Close();
}
}
content::RunAllPendingInMessageLoop();
diff --git a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
index f21d544..6a2d435 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
@@ -18,6 +18,7 @@
#include "chrome/browser/sessions/session_restore.h"
#include "chrome/browser/ui/browser.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_list_observer.h"
#include "chrome/browser/ui/browser_window.h"
@@ -88,10 +89,9 @@ class StartupBrowserCreatorTest : public ExtensionBrowserTest {
// Find the new browser.
Browser* other_browser = NULL;
- for (BrowserList::const_iterator i = BrowserList::begin();
- i != BrowserList::end() && !other_browser; ++i) {
- if (*i != browser())
- other_browser = *i;
+ for (chrome::BrowserIterator it; !it.done() && !other_browser; it.Next()) {
+ if (*it != browser())
+ other_browser = *it;
}
ASSERT_TRUE(other_browser);
ASSERT_TRUE(other_browser != browser());
@@ -100,10 +100,9 @@ class StartupBrowserCreatorTest : public ExtensionBrowserTest {
Browser* FindOneOtherBrowserForProfile(Profile* profile,
Browser* not_this_browser) {
- for (BrowserList::const_iterator i = BrowserList::begin();
- i != BrowserList::end(); ++i) {
- if (*i != not_this_browser && (*i)->profile() == profile)
- return *i;
+ for (chrome::BrowserIterator it; !it.done(); it.Next()) {
+ if (*it != not_this_browser && it->profile() == profile)
+ return *it;
}
return NULL;
}
generated by cgit v1.1 at 2025-05-29 06:17:12 +0000