summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-05 22:57:01 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-05 22:57:01 +0000
commit2e3ad4f042dbdb2bdf784d328ea53b190d408bb6 (patch)
tree750f04f78b5617dd9bfe329628c1bc16eec7ba42
parent51f44b963a403467bb25d448461d1a18ce3b06ca (diff)
downloadchromium_src-2e3ad4f042dbdb2bdf784d328ea53b190d408bb6.zip
chromium_src-2e3ad4f042dbdb2bdf784d328ea53b190d408bb6.tar.gz
chromium_src-2e3ad4f042dbdb2bdf784d328ea53b190d408bb6.tar.bz2
widen disabling of tests since they fail on other platforms
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239063 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/apps/web_view_browsertest.cc11
1 files changed, 5 insertions, 6 deletions
diff --git a/chrome/browser/apps/web_view_browsertest.cc b/chrome/browser/apps/web_view_browsertest.cc
index 83aa8f9..7d6d6cc 100644
--- a/chrome/browser/apps/web_view_browsertest.cc
+++ b/chrome/browser/apps/web_view_browsertest.cc
@@ -647,11 +647,10 @@ IN_PROC_BROWSER_TEST_F(WebViewTest, AutoSizeSW) {
}
#endif
-#if !defined(OS_MACOSX) // http://crbug.com/326332
-IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestAutosizeAfterNavigation) {
+// http://crbug.com/326332
+IN_PROC_BROWSER_TEST_F(WebViewTest, DISABLED_Shim_TestAutosizeAfterNavigation) {
TestHelper("testAutosizeAfterNavigation", "web_view/shim", NO_TEST_SERVER);
}
-#endif
IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestAutosizeBeforeNavigation) {
TestHelper("testAutosizeBeforeNavigation", "web_view/shim", NO_TEST_SERVER);
@@ -821,12 +820,12 @@ IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestContentLoadEvent) {
TestHelper("testContentLoadEvent", "web_view/shim", NO_TEST_SERVER);
}
-#if !defined(OS_MACOSX) // http://crbug.com/326330
-IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestDeclarativeWebRequestAPI) {
+// http://crbug.com/326330
+IN_PROC_BROWSER_TEST_F(WebViewTest,
+ DISABLED_Shim_TestDeclarativeWebRequestAPI) {
TestHelper("testDeclarativeWebRequestAPI",
"web_view/shim",
NEEDS_TEST_SERVER);
-#endif
}
IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestWebRequestAPI) {