diff options
Diffstat (limited to 'chrome_frame/test/chrome_frame_automation_mock.cc')
| -rw-r--r-- | chrome_frame/test/chrome_frame_automation_mock.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome_frame/test/chrome_frame_automation_mock.cc b/chrome_frame/test/chrome_frame_automation_mock.cc index 966a176..5dce4df 100644 --- a/chrome_frame/test/chrome_frame_automation_mock.cc +++ b/chrome_frame/test/chrome_frame_automation_mock.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -12,7 +12,7 @@ const int kShortWaitTimeout = 5 * 1000; // 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) { +TEST(ChromeFrame, DISABLED_Launch) { MessageLoopForUI loop; AutomationMockLaunch mock_launch(&loop, kLongWaitTimeout); @@ -47,7 +47,7 @@ TEST(ChromeFrame, PostMessage) { // Marking this test as flaky as it fails randomly on the CF builders. // http://code.google.com/p/chromium/issues/detail?id=81479 -TEST(ChromeFrame, FLAKY_RequestStart) { +TEST(ChromeFrame, DISABLED_RequestStart) { MessageLoopForUI loop; AutomationMockHostNetworkRequestStart mock_request_start(&loop, kLongWaitTimeout); |