summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authoryurys@chromium.org <yurys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-25 16:00:09 +0000
committeryurys@chromium.org <yurys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-25 16:00:09 +0000
commit38964b44d8bc915a00ecb871208a8b1e54e81de3 (patch)
tree0dc9c89b17e2286a5ba29d0a266141f7265a7e03 /chrome
parent85893f16a03ab3227aaea129b6ae08c0181fc926 (diff)
downloadchromium_src-38964b44d8bc915a00ecb871208a8b1e54e81de3.zip
chromium_src-38964b44d8bc915a00ecb871208a8b1e54e81de3.tar.gz
chromium_src-38964b44d8bc915a00ecb871208a8b1e54e81de3.tar.bz2
Disable two tests started crashing after WebKit r101166
BUG=105433 TEST=None Review URL: http://codereview.chromium.org/8702013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111600 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/debugger/devtools_sanity_unittest.cc3
-rw-r--r--chrome/browser/prerender/prerender_browsertest.cc3
2 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/debugger/devtools_sanity_unittest.cc b/chrome/browser/debugger/devtools_sanity_unittest.cc
index 282b135..f5ff108 100644
--- a/chrome/browser/debugger/devtools_sanity_unittest.cc
+++ b/chrome/browser/debugger/devtools_sanity_unittest.cc
@@ -509,7 +509,8 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestConsoleOnNavigateBack) {
#endif
// Tests that inspector will reattach to inspected page when it is reloaded
// after a crash. See http://crbug.com/101952
-IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestReattachAfterCrash) {
+// Disabled due to http://crbug.com/105433
+IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, DISABLED_TestReattachAfterCrash) {
OpenDevToolsWindow(kDebuggerTestPage);
ui_test_utils::CrashTab(GetInspectedTab());
diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc
index 83043b5..470ac5f 100644
--- a/chrome/browser/prerender/prerender_browsertest.cc
+++ b/chrome/browser/prerender/prerender_browsertest.cc
@@ -1832,8 +1832,9 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClickNewBackgroundTab) {
OpenDestURLViaClickNewBackgroundTab();
}
+// Disabled due to http://crbug.com/105433
IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
- NavigateToPrerenderedPageWhenDevToolsAttached) {
+ DISABLED_NavigateToPrerenderedPageWhenDevToolsAttached) {
DisableJavascriptCalls();
TabContents* tab_contents = browser()->GetSelectedTabContents();
RenderViewHost* inspected_rvh = tab_contents->render_view_host();