diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-08 08:31:01 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-08 08:31:01 +0000 |
| commit | 9b7770d492131fc745cd485afc26d0929533afe0 (patch) | |
| tree | 2dbb9c73a2d2fb33147f0f59aa66c0d2295b82d2 /chrome/renderer | |
| parent | fd1b8ea1c39a8b99285bdca24e22731f463e63d8 (diff) | |
| download | chromium_src-9b7770d492131fc745cd485afc26d0929533afe0.zip chromium_src-9b7770d492131fc745cd485afc26d0929533afe0.tar.gz chromium_src-9b7770d492131fc745cd485afc26d0929533afe0.tar.bz2 | |
Replace #if 0 used to disable test, the DISABLED_ and FLAKY_
prefixes, so the code doesn't rot.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/2035009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46782 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
| -rw-r--r-- | chrome/renderer/render_view_unittest.cc | 11 |
1 files changed, 4 insertions, 7 deletions
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); |