Try to make the start up tests less flaky by switching

chrome/test/startup/feature_startup_test.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/file_util.h"
 #include "base/gfx/rect.h"
 #include "base/path_service.h"
 #include "base/perftimer.h"
 #include "base/string_util.h"
 #include "base/time.h"
@@ skipping 62 matching lines @@
       // TODO(port): SetBounds returns false when not implemented.
       // It is OK to comment out the resize since it will still be useful to
       // test the default size of the window.
       ASSERT_TRUE(window->GetWindow().get()->SetBounds(gfx::Rect(1000, 1000)));
 #endif
       int tab_count = -1;
       ASSERT_TRUE(window->GetTabCount(&tab_count));
       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 load_time;
       ASSERT_TRUE(automation()->WaitForInitialNewTabUILoad(&load_time));
 
       if (want_warm) {
         // Bring up a second tab, now that we've already shown one tab.
-        window->ApplyAccelerator(IDC_NEW_TAB);
-        ASSERT_TRUE(window->WaitForTabCountToBecome(3, 5000));
+        window->RunCommand(IDC_NEW_TAB);
+        ASSERT_TRUE(window->GetTabCount(&tab_count));
+        ASSERT_EQ(3, tab_count);
         ASSERT_TRUE(automation()->WaitForInitialNewTabUILoad(&load_time));
       }
       timings[i] = TimeDelta::FromMilliseconds(load_time);
 
       window = NULL;
       UITest::TearDown();
     }
 
     PrintTimings(label, timings, important);
   }
@@ skipping 90 matching lines @@
 }
 
 TEST_F(NewTabUIStartupTest, NativeFrameGtkThemeCold) {
   RunStartupTest("tab_custom_frame_gtk_theme_cold", false /* cold */,
                  false /* not important */,
                  UITest::CUSTOM_FRAME_NATIVE_THEME);
 }
 #endif
 
 }  // namespace