Index: chrome/browser/apps/web_view_browsertest.cc |
diff --git a/chrome/browser/apps/web_view_browsertest.cc b/chrome/browser/apps/web_view_browsertest.cc |
index c5d4fa3bd653ad15c5ad9a13fa0942e66ed51ce8..3aacc481ad27eb40f7896745831513985009f5c7 100644 |
--- a/chrome/browser/apps/web_view_browsertest.cc |
+++ b/chrome/browser/apps/web_view_browsertest.cc |
@@ -595,12 +595,6 @@ IN_PROC_BROWSER_TEST_F(WebViewTest, AutoSizeSW) { |
#endif |
IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestAutosizeAfterNavigation) { |
-#if defined(USE_AURA) |
- // TODO(gab): Fix this test in software compositing mode: |
- // http://crbug.com/295801. |
- if (!content::GpuDataManager::GetInstance()->CanUseGpuBrowserCompositor()) |
- return; |
-#endif |
TestHelper("testAutosizeAfterNavigation", |
"DoneShimTest.PASSED", |
"DoneShimTest.FAILED", |
@@ -608,24 +602,12 @@ IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestAutosizeAfterNavigation) { |
} |
IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestAutosizeBeforeNavigation) { |
-#if defined(USE_AURA) |
- // TODO(gab): Fix this test in software compositing mode: |
- // http://crbug.com/295801. |
- if (!content::GpuDataManager::GetInstance()->CanUseGpuBrowserCompositor()) |
- return; |
-#endif |
TestHelper("testAutosizeBeforeNavigation", |
"DoneShimTest.PASSED", |
"DoneShimTest.FAILED", |
"web_view/shim"); |
} |
IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestAutosizeRemoveAttributes) { |
-#if defined(USE_AURA) |
- // TODO(gab): Fix this test in software compositing mode: |
- // http://crbug.com/295801. |
- if (!content::GpuDataManager::GetInstance()->CanUseGpuBrowserCompositor()) |
- return; |
-#endif |
TestHelper("testAutosizeRemoveAttributes", |
"DoneShimTest.PASSED", |
"DoneShimTest.FAILED", |
@@ -642,12 +624,6 @@ IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestAutosizeRemoveAttributes) { |
#endif |
IN_PROC_BROWSER_TEST_F(WebViewTest, |
MAYBE_Shim_TestAutosizeWithPartialAttributes) { |
-#if defined(USE_AURA) |
- // TODO(gab): Fix this test in software compositing mode: |
- // http://crbug.com/295801. |
- if (!content::GpuDataManager::GetInstance()->CanUseGpuBrowserCompositor()) |
- return; |
-#endif |
TestHelper("testAutosizeWithPartialAttributes", |
"DoneShimTest.PASSED", |
"DoneShimTest.FAILED", |
@@ -970,12 +946,6 @@ IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestNavigationToExternalProtocol) { |
} |
IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestResizeWebviewResizesContent) { |
-#if defined(USE_AURA) |
- // TODO(gab): Fix this test in software compositing mode: |
- // http://crbug.com/295801. |
- if (!content::GpuDataManager::GetInstance()->CanUseGpuBrowserCompositor()) |
- return; |
-#endif |
TestHelper("testResizeWebviewResizesContent", |
"DoneShimTest.PASSED", |
"DoneShimTest.FAILED", |