diff options
| author | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-15 01:40:25 +0000 |
|---|---|---|
| committer | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-15 01:40:25 +0000 |
| commit | f01a3977b437cb75a367446eca821e0fbe2ec483 (patch) | |
| tree | 144b97039d859404d25e948c7ddd1bd9c65db3cd /chrome_frame | |
| parent | 8711d222748645c2c13188899ee1143914945088 (diff) | |
| download | chromium_src-f01a3977b437cb75a367446eca821e0fbe2ec483.zip chromium_src-f01a3977b437cb75a367446eca821e0fbe2ec483.tar.gz chromium_src-f01a3977b437cb75a367446eca821e0fbe2ec483.tar.bz2 | |
Revert "Disabling ChromeFrame.Launch" (r124964)
It is my belief that http://crrev.com/126334 fixes the underlying cause and that http://crrev.com/126280 makes the tests a little more robust against it.
BUG=81479
TEST=chrome_frame_tests.exe covers it
TBR=robertshield@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9699060
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126818 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/test/chrome_frame_automation_mock.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/chrome_frame/test/chrome_frame_automation_mock.cc b/chrome_frame/test/chrome_frame_automation_mock.cc index fae0ae1..1f50b2e 100644 --- a/chrome_frame/test/chrome_frame_automation_mock.cc +++ b/chrome_frame/test/chrome_frame_automation_mock.cc @@ -8,10 +8,7 @@ const int kLongWaitTimeout = 25 * 1000; -// Note that this test fails occasionally. Disabling it altogether (rather than -// marking as flaky to see if the failure cascades down to the next test. -// http://crbug.com/81479 -TEST(ChromeFrame, DISABLED_Launch) { +TEST(ChromeFrame, Launch) { MessageLoopForUI loop; AutomationMockLaunch mock_launch(&loop, kLongWaitTimeout); |