Fix flakiness...

chrome_frame/test/ui_test.cc

Index: chrome_frame/test/ui_test.cc
===================================================================
--- chrome_frame/test/ui_test.cc	(revision 65940)
+++ chrome_frame/test/ui_test.cc	(working copy)
@@ -67,9 +67,12 @@
 }
 
 // Tests keyboard shortcuts for back and forward.
-// Marking this test FLAKY as it fails at times on the buildbot.
-// http://code.google.com/p/chromium/issues/detail?id=26549
-TEST_P(FullTabUITest, FLAKY_KeyboardBackForward) {
+TEST_P(FullTabUITest, KeyboardBackForward) {
+  if (IsWorkstationLocked()) {
+    LOG(ERROR) << "This test cannot be run in a locked workstation.";
+    return;
+  }
+
   std::wstring page1 = GetSimplePageUrl();
   std::wstring page2 = GetLinkPageUrl();
   bool in_cf = GetParam().invokes_cf();
@@ -89,7 +92,7 @@
   EXPECT_CALL(ie_mock_, OnLoad(in_cf, StrEq(page2)))
       .WillOnce(testing::DoAll(
           SetFocusToRenderer(&ie_mock_),
-          DelaySendScanCode(&loop_, 500, bkspace, simulate_input::NONE)));
+          DelaySendScanCode(&loop_, 1000, bkspace, simulate_input::NONE)));
 
   EXPECT_CALL(ie_mock_, OnLoad(in_cf, StrEq(page1)))
       .WillOnce(testing::DoAll(
@@ -135,6 +138,7 @@
       .WillOnce(testing::Return());
 
   EXPECT_CALL(win_observer_mock, OnWindowClose(_))
+      .Times(testing::AtMost(2))
       .WillOnce(CloseBrowserMock(&ie_mock_));
 

[ananta, 2010/11/12 21:10:34]

Add another .WillOnce here? Perhaps .WillOnce(testing::Return());

   LaunchIEAndNavigate(GetSimplePageUrl());