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

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

Issue 10391158: Moves methods for finding browsers to browser_finder. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Include fixs Created 8 years, 7 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
Index: chrome/browser/ui/browser_browsertest.cc
diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc
index 6b0127ab526656b9450af2f1d851e5ce8675ce16..02a51c338eb673ccd861d65e71d05d51855c72d3 100644
--- a/chrome/browser/ui/browser_browsertest.cc
+++ b/chrome/browser/ui/browser_browsertest.cc
@@ -28,6 +28,7 @@
#include "chrome/browser/ui/app_modal_dialogs/js_modal_dialog.h"
#include "chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.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_navigator.h"
#include "chrome/browser/ui/browser_window.h"
@@ -769,7 +770,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, DISABLED_ConvertTabToAppShortcut) {
WebContents* app_tab = browser()->AddSelectedTabWithURL(
http_url, content::PAGE_TRANSITION_TYPED)->web_contents();
ASSERT_EQ(2, browser()->tab_count());
- ASSERT_EQ(1u, BrowserList::GetBrowserCount(browser()->profile()));
+ ASSERT_EQ(1u, browser::GetBrowserCount(browser()->profile()));
// Normal tabs should accept load drops.
EXPECT_TRUE(initial_tab->GetMutableRendererPrefs()->can_accept_load_drops);
@@ -779,7 +780,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, DISABLED_ConvertTabToAppShortcut) {
browser()->ConvertContentsToApplication(app_tab);
// The launch should have created a new browser.
- ASSERT_EQ(2u, BrowserList::GetBrowserCount(browser()->profile()));
+ ASSERT_EQ(2u, browser::GetBrowserCount(browser()->profile()));
// Find the new browser.
Browser* app_browser = NULL;
@@ -907,7 +908,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, AppIdSwitch) {
// Check that the new browser has an app name.
// The launch should have created a new browser.
- ASSERT_EQ(2u, BrowserList::GetBrowserCount(browser()->profile()));
+ ASSERT_EQ(2u, browser::GetBrowserCount(browser()->profile()));
// Find the new browser.
Browser* new_browser = NULL;
@@ -1259,7 +1260,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, RestorePinnedTabs) {
launch.ProcessStartupURLs(std::vector<GURL>());
// The launch should have created a new browser.
- ASSERT_EQ(2u, BrowserList::GetBrowserCount(browser()->profile()));
+ ASSERT_EQ(2u, browser::GetBrowserCount(browser()->profile()));
// Find the new browser.
Browser* new_browser = NULL;
@@ -1337,7 +1338,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, OpenAppWindowLikeNtp) {
EXPECT_EQ(extension_app->GetFullLaunchURL(), app_window->GetURL());
// The launch should have created a new browser.
- ASSERT_EQ(2u, BrowserList::GetBrowserCount(browser()->profile()));
+ ASSERT_EQ(2u, browser::GetBrowserCount(browser()->profile()));
// Find the new browser.
Browser* new_browser = NULL;

Powered by Google App Engine
This is Rietveld 408576698