Revert 221023 "Reland after fix: Improve <webview> autosize:"

trunk/src/chrome/browser/apps/web_view_browsertest.cc

Index: trunk/src/chrome/browser/apps/web_view_browsertest.cc
===================================================================
--- trunk/src/chrome/browser/apps/web_view_browsertest.cc	(revision 221163)
+++ trunk/src/chrome/browser/apps/web_view_browsertest.cc	(working copy)
@@ -20,7 +20,6 @@
 #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"
@@ -259,17 +258,6 @@
     }
   }
 
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
-    const testing::TestInfo* const test_info =
-        testing::UnitTest::GetInstance()->current_test_info();
-
-    // Force SW rendering to check autosize bug.
-    if (!strncmp(test_info->name(), "AutoSizeSW", strlen("AutosizeSW")))
-      command_line->AppendSwitch(switches::kDisableForceCompositingMode);
-
-    extensions::PlatformAppBrowserTest::SetUpCommandLine(command_line);
-  }
-
   // This method is responsible for initializing a packaged app, which contains
   // multiple webview tags. The tags have different partition identifiers and
   // their WebContent objects are returned as output. The method also verifies
@@ -579,20 +567,6 @@
       << message_;
 }
 
-IN_PROC_BROWSER_TEST_F(WebViewTest, AutoSize) {
-  ASSERT_TRUE(RunPlatformAppTest("platform_apps/web_view/autosize"))
-      << message_;
-}
-
-#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) {
   TestHelper("testAutosizeAfterNavigation",
              "DoneShimTest.PASSED",
@@ -613,8 +587,9 @@
              "web_view/shim");
 }
 
+// This test is flaky. crbug.com/282116
 IN_PROC_BROWSER_TEST_F(WebViewTest,
-                       Shim_TestAutosizeWithPartialAttributes) {
+                       DISABLED_Shim_TestAutosizeWithPartialAttributes) {
   TestHelper("testAutosizeWithPartialAttributes",
              "DoneShimTest.PASSED",
              "DoneShimTest.FAILED",