summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/dom_ui/new_tab_ui_uitest.cc10
-rw-r--r--chrome/test/startup/feature_startup_test.cc5
2 files changed, 9 insertions, 6 deletions
diff --git a/chrome/browser/dom_ui/new_tab_ui_uitest.cc b/chrome/browser/dom_ui/new_tab_ui_uitest.cc
index 3106922..1520b6e 100644
--- a/chrome/browser/dom_ui/new_tab_ui_uitest.cc
+++ b/chrome/browser/dom_ui/new_tab_ui_uitest.cc
@@ -38,8 +38,9 @@ TEST_F(NewTabUITest, NTPHasThumbnails) {
ASSERT_EQ(1, tab_count);
// Bring up a new tab page.
- window->ApplyAccelerator(IDC_NEW_TAB);
- WaitUntilTabCount(2);
+ window->RunCommand(IDC_NEW_TAB);
+ ASSERT_TRUE(window->GetTabCount(&tab_count));
+ ASSERT_EQ(2, tab_count);
int load_time;
ASSERT_TRUE(automation()->WaitForInitialNewTabUILoad(&load_time));
@@ -119,8 +120,9 @@ TEST_F(NewTabUITest, HomePageLink) {
ASSERT_EQ(1, tab_count);
// Bring up a new tab page.
- browser->ApplyAccelerator(IDC_NEW_TAB);
- WaitUntilTabCount(2);
+ browser->RunCommand(IDC_NEW_TAB);
+ ASSERT_TRUE(browser->GetTabCount(&tab_count));
+ ASSERT_EQ(2, tab_count);
int load_time;
ASSERT_TRUE(automation()->WaitForInitialNewTabUILoad(&load_time));
diff --git a/chrome/test/startup/feature_startup_test.cc b/chrome/test/startup/feature_startup_test.cc
index c3b07ea..b75c8ea 100644
--- a/chrome/test/startup/feature_startup_test.cc
+++ b/chrome/test/startup/feature_startup_test.cc
@@ -144,8 +144,9 @@ class NewTabUIStartupTest : public UITest {
ASSERT_EQ(1, tab_count);
// Hit ctl-t and wait for the tab to load.
- window->ApplyAccelerator(IDC_NEW_TAB);
- ASSERT_TRUE(window->WaitForTabCountToBecome(2, 5000));
+ window->RunCommand(IDC_NEW_TAB);
+ ASSERT_TRUE(window->GetTabCount(&tab_count));
+ ASSERT_EQ(2, tab_count);
int duration;
ASSERT_TRUE(automation()->WaitForInitialNewTabUILoad(&duration));