Fix <webview> with software compositor

chrome/browser/apps/web_view_browsertest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "apps/native_app_window.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
 #include "chrome/browser/automation/automation_util.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/prerender/prerender_link_manager.h"
 #include "chrome/browser/prerender/prerender_link_manager_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/gpu_data_manager.h"

[gab, 2013/09/27 13:18:06]

I think you can now remove this include too; at least it was originally added
for the checks removed below.

 #include "content/public/browser/interstitial_page.h"
 #include "content/public/browser/interstitial_page_delegate.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/fake_speech_recognition_manager.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/test/embedded_test_server/http_request.h"
@@ skipping 559 matching lines @@
 #if !defined(OS_CHROMEOS)
 // This test ensures <webview> doesn't crash in SW rendering when autosize is
 // turned on.
 IN_PROC_BROWSER_TEST_F(WebViewTest, AutoSizeSW) {
   ASSERT_TRUE(RunPlatformAppTest("platform_apps/web_view/autosize"))
       << message_;
 }
 #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",
              "web_view/shim");
 }
 
 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",
              "web_view/shim");
 }
 
 // This test is disabled due to being flaky. http://crbug.com/282116
 #if defined(OS_WIN)
 #define MAYBE_Shim_TestAutosizeWithPartialAttributes \
     DISABLED_Shim_TestAutosizeWithPartialAttributes
 #else
 #define MAYBE_Shim_TestAutosizeWithPartialAttributes \
     Shim_TestAutosizeWithPartialAttributes
 #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",
              "web_view/shim");
 }
 
 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestAPIMethodExistence) {
   TestHelper("testAPIMethodExistence",
              "DoneShimTest.PASSED",
              "DoneShimTest.FAILED",
@@ skipping 302 matching lines @@
 }
 
 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestNavigationToExternalProtocol) {
   TestHelper("testNavigationToExternalProtocol",
              "DoneShimTest.PASSED",
              "DoneShimTest.FAILED",
              "web_view/shim");
 }
 
 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",
              "web_view/shim");
 }
 
 // This test makes sure we do not crash if app is closed while interstitial
 // page is being shown in guest.
 // Test flaky on windows; http://crbug.com/297014 .
 #if defined(OS_WIN)
@@ skipping 787 matching lines @@
              "DoneDialogTest.FAILED",
              "web_view/dialog");
 }
 
 IN_PROC_BROWSER_TEST_F(WebViewTest, Dialog_TestPromptDialog) {
   TestHelper("testPromptDialog",
              "DoneDialogTest.PASSED",
              "DoneDialogTest.FAILED",
              "web_view/dialog");
 }