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

Unified Diff: chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc

Issue 12212120: Replace most BrowserList::empty() and BrowserList::size() calls by multi-desktop aware calls. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge up to r182110 Created 7 years, 10 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/uma_browsing_activity_observer.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc
diff --git a/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc b/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc
index d2607f558f36eda976c552cad1d70ff5c4c8b17b..cf65bef60d63fc1ae0e56e1693c5f8431e907eda 100644
--- a/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc
+++ b/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc
@@ -10,7 +10,7 @@
#include "base/memory/scoped_ptr.h"
#include "chrome/browser/history/history_types.h"
#include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/browser/ui/webui/chrome_web_contents_handler.h"
#include "chrome/common/url_constants.h"
@@ -74,7 +74,7 @@ TEST_F(WebDialogWebContentsDelegateTest, DoNothingMethodsTest) {
test_web_contents_delegate_->UpdateTargetURL(NULL, 0, GURL());
test_web_contents_delegate_->MoveContents(NULL, gfx::Rect());
EXPECT_EQ(0, browser()->tab_strip_model()->count());
- EXPECT_EQ(1U, BrowserList::size());
+ EXPECT_EQ(1U, chrome::GetTotalBrowserCount());
}
TEST_F(WebDialogWebContentsDelegateTest, OpenURLFromTabTest) {
@@ -83,7 +83,7 @@ TEST_F(WebDialogWebContentsDelegateTest, OpenURLFromTabTest) {
NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK, false));
// This should create a new foreground tab in the existing browser.
EXPECT_EQ(1, browser()->tab_strip_model()->count());
- EXPECT_EQ(1U, BrowserList::size());
+ EXPECT_EQ(1U, chrome::GetTotalBrowserCount());
}
TEST_F(WebDialogWebContentsDelegateTest, AddNewContentsForegroundTabTest) {
@@ -93,7 +93,7 @@ TEST_F(WebDialogWebContentsDelegateTest, AddNewContentsForegroundTabTest) {
NULL, contents, NEW_FOREGROUND_TAB, gfx::Rect(), false, NULL);
// This should create a new foreground tab in the existing browser.
EXPECT_EQ(1, browser()->tab_strip_model()->count());
- EXPECT_EQ(1U, BrowserList::size());
+ EXPECT_EQ(1U, chrome::GetTotalBrowserCount());
}
TEST_F(WebDialogWebContentsDelegateTest, DetachTest) {
@@ -107,7 +107,7 @@ TEST_F(WebDialogWebContentsDelegateTest, DetachTest) {
test_web_contents_delegate_->AddNewContents(NULL, NULL, NEW_FOREGROUND_TAB,
gfx::Rect(), false, NULL);
EXPECT_EQ(0, browser()->tab_strip_model()->count());
- EXPECT_EQ(1U, BrowserList::size());
+ EXPECT_EQ(1U, chrome::GetTotalBrowserCount());
}
} // namespace
« no previous file with comments | « chrome/browser/ui/uma_browsing_activity_observer.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698