Marking the ChromeFrame.Launch CF test as flaky as it times out at times on the CF builders.

Posting a delayed quit task to the message loop to ensure that this loop does not run forever.

BUG=81479
TBR=amit
Review URL: http://codereview.chromium.org/6920003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83998 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 13 insertions, 1 deletions

diff --git a/chrome_frame/test/chrome_frame_automation_mock.cc b/chrome_frame/test/chrome_frame_automation_mock.cc
index 815f871..9cd1e4c 100644
--- a/chrome_frame/test/chrome_frame_automation_mock.cc
+++ b/chrome_frame/test/chrome_frame_automation_mock.cc
@@ -3,15 +3,21 @@
 // found in the LICENSE file.
 
 #include "chrome_frame/test/chrome_frame_automation_mock.h"
+#include "chrome_frame/test/chrome_frame_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 const int kLongWaitTimeout = 25 * 1000;
 const int kShortWaitTimeout = 5 * 1000;
 
-TEST(ChromeFrame, Launch) {
+// This test has been marked as flaky as it randomly times out on the CF
+// builders
+// http://code.google.com/p/chromium/issues/detail?id=81479
+TEST(ChromeFrame, FLAKY_Launch) {
   MessageLoopForUI loop;
   AutomationMockLaunch mock_launch(&loop, kLongWaitTimeout);
 
+  loop.PostDelayedTask(FROM_HERE, new MessageLoop::QuitTask, kLongWaitTimeout);
+
   mock_launch.Navigate("about:blank");
   loop.Run(NULL);
   EXPECT_TRUE(mock_launch.launch_result());
@@ -21,6 +27,8 @@ TEST(ChromeFrame, Navigate) {
   MessageLoopForUI loop;
   AutomationMockNavigate mock_navigate(&loop, kLongWaitTimeout);
 
+  loop.PostDelayedTask(FROM_HERE, new MessageLoop::QuitTask, kLongWaitTimeout);
+
   mock_navigate.NavigateRelativeFile(L"postmessage_basic_frame.html");
   loop.Run(NULL);
   EXPECT_FALSE(mock_navigate.navigation_result());
@@ -30,6 +38,8 @@ TEST(ChromeFrame, PostMessage) {
   MessageLoopForUI loop;
   AutomationMockPostMessage mock_postmessage(&loop, kLongWaitTimeout);
 
+  loop.PostDelayedTask(FROM_HERE, new MessageLoop::QuitTask, kLongWaitTimeout);
+
   mock_postmessage.NavigateRelativeFile(L"postmessage_basic_frame.html");
   loop.Run(NULL);
   EXPECT_FALSE(mock_postmessage.postmessage_result());
@@ -40,6 +50,8 @@ TEST(ChromeFrame, RequestStart) {
   AutomationMockHostNetworkRequestStart mock_request_start(&loop,
                                                            kLongWaitTimeout);
 
+  loop.PostDelayedTask(FROM_HERE, new MessageLoop::QuitTask, kLongWaitTimeout);
+
   mock_request_start.NavigateRelative(L"postmessage_basic_frame.html");
   loop.Run(NULL);
   EXPECT_TRUE(mock_request_start.request_start_result());