Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(131)

Side by Side Diff: chrome/browser/iframe_uitest.cc

Issue 113211: Re-enable IFrameTest.InEmptyFrame. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Created 11 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/file_path.h" 6 #include "base/file_path.h"
7 #include "base/platform_thread.h" 7 #include "base/platform_thread.h"
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 #include "chrome/test/ui/ui_test.h" 9 #include "chrome/test/ui/ui_test.h"
10 #include "net/base/net_util.h" 10 #include "net/base/net_util.h"
(...skipping 12 matching lines...) Expand all
23 EXPECT_EQ(std::wstring(page_title), GetActiveTabTitle()); 23 EXPECT_EQ(std::wstring(page_title), GetActiveTabTitle());
24 24
25 // UITest will check if this crashed. 25 // UITest will check if this crashed.
26 } 26 }
27 }; 27 };
28 28
29 TEST_F(IFrameTest, Crash) { 29 TEST_F(IFrameTest, Crash) {
30 NavigateAndVerifyTitle("iframe.html", L"iframe test"); 30 NavigateAndVerifyTitle("iframe.html", L"iframe test");
31 } 31 }
32 32
33 #if !defined(OS_LINUX)
34 // Temporarily disabled on Linux -- see bug 9870.
35 // http://code.google.com/p/chromium/issues/detail?id=9870
36 TEST_F(IFrameTest, InEmptyFrame) { 33 TEST_F(IFrameTest, InEmptyFrame) {
37 NavigateAndVerifyTitle("iframe_in_empty_frame.html", L"iframe test"); 34 NavigateAndVerifyTitle("iframe_in_empty_frame.html", L"iframe test");
38 } 35 }
39 #endif
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698