diff options
| -rw-r--r-- | base/message_loop_unittest.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/importer/importer_unittest.cc | 2 | ||||
| -rw-r--r-- | chrome/renderer/render_view_unittest.cc | 11 |
3 files changed, 7 insertions, 12 deletions
diff --git a/base/message_loop_unittest.cc b/base/message_loop_unittest.cc index 00a1dfe..5c732ca 100644 --- a/base/message_loop_unittest.cc +++ b/base/message_loop_unittest.cc @@ -1376,19 +1376,17 @@ TEST(MessageLoopTest, PostDelayedTask_SharedTimer_SubPump) { #endif // TODO(darin): re-enable these tests once MessageLoop supports them again. -#if 0 -TEST(MessageLoopTest, EnsureTaskDeletion) { +TEST(MessageLoopTest, DISABLED_EnsureTaskDeletion) { RunTest_EnsureTaskDeletion(MessageLoop::TYPE_DEFAULT); RunTest_EnsureTaskDeletion(MessageLoop::TYPE_UI); RunTest_EnsureTaskDeletion(MessageLoop::TYPE_IO); } -TEST(MessageLoopTest, EnsureTaskDeletion_Chain) { +TEST(MessageLoopTest, DISABLED_EnsureTaskDeletion_Chain) { RunTest_EnsureTaskDeletion_Chain(MessageLoop::TYPE_DEFAULT); RunTest_EnsureTaskDeletion_Chain(MessageLoop::TYPE_UI); RunTest_EnsureTaskDeletion_Chain(MessageLoop::TYPE_IO); } -#endif #if defined(OS_WIN) TEST(MessageLoopTest, Crasher) { diff --git a/chrome/browser/importer/importer_unittest.cc b/chrome/browser/importer/importer_unittest.cc index f4ebbe2..edc3620 100644 --- a/chrome/browser/importer/importer_unittest.cc +++ b/chrome/browser/importer/importer_unittest.cc @@ -364,7 +364,7 @@ TEST_F(ImporterTest, IEImporter) { // Sets up dummy password data. HRESULT res; - #if 0 // This part of the test is disabled. See bug #2466 +#if 0 // This part of the test is disabled. See bug #2466 ScopedComPtr<IPStore> pstore; HMODULE pstorec_dll; GUID type = IEImporter::kUnittestGUID; diff --git a/chrome/renderer/render_view_unittest.cc b/chrome/renderer/render_view_unittest.cc index 34bece1b..9c5630e 100644 --- a/chrome/renderer/render_view_unittest.cc +++ b/chrome/renderer/render_view_unittest.cc @@ -872,22 +872,19 @@ TEST_F(RenderViewTest, InsertCharacters) { #endif } -#if 0 // TODO(tyoshino): After fixing flakiness, enable this test. -TEST_F(RenderViewTest, DidFailProvisionalLoadWithErrorForError) { - GetMainFrame()->SetInViewSourceMode(true); +TEST_F(RenderViewTest, FLAKY_DidFailProvisionalLoadWithErrorForError) { + GetMainFrame()->enableViewSourceMode(true); WebURLError error; error.domain.fromUTF8("test_domain"); error.reason = net::ERR_FILE_NOT_FOUND; error.unreachableURL = GURL("http://foo"); WebFrame* web_frame = GetMainFrame(); - WebView* web_view = web_frame->GetView(); // An error occurred. - view_->DidFailProvisionalLoadWithError(web_view, error, web_frame); + view_->didFailProvisionalLoad(web_frame, error); // Frame should exit view-source mode. - EXPECT_FALSE(web_frame->GetInViewSourceMode()); + EXPECT_FALSE(web_frame->isViewSourceModeEnabled()); } -#endif TEST_F(RenderViewTest, DidFailProvisionalLoadWithErrorForCancellation) { GetMainFrame()->enableViewSourceMode(true); |