Fixing WebViewVisibilityTests for OOPIF-<webview>.

chrome/browser/apps/guest_view/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 <queue>
 #include <utility>
 
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/path_service.h"
@@ skipping 710 matching lines @@
   content::WebContents* embedder_web_contents_;
 };
 
 // The following test suits are created to group tests based on specific
 // features of <webview>.
 // These features current would not work with --site-per-process and is
 // disabled on site isolation FYI bots.
 class WebViewNewWindowTest : public WebViewTest {};
 class WebViewSizeTest : public WebViewTest {};
 class WebViewSpeechAPITest : public WebViewTest {};
-class WebViewVisibilityTest : public WebViewTest {};
+class WebViewVisibilityTest : public WebViewTest,
+                              public ::testing::WithParamInterface<bool> {
+ protected:
+  void SetUpCommandLine(base::CommandLine* command_line) override {
+    if (GetParam())
+      command_line->AppendSwitchASCII(
+          switches::kSitePerProcess, switches::kUseCrossProcessFramesForGuests);
+
+    WebViewTest::SetUpCommandLine(command_line);
+  }
+};
 
 // Test suite that containts tests that are meant to run with and without
 // --site-per-process.
 class WebViewCommonTest : public extensions::PlatformAppBrowserTest {};
 
 class WebViewDPITest : public WebViewTest {
  protected:
   void SetUpCommandLine(base::CommandLine* command_line) override {
     WebViewTest::SetUpCommandLine(command_line);
     command_line->AppendSwitchASCII(switches::kForceDeviceScaleFactor,
@@ skipping 60 matching lines @@
 
   EXPECT_TRUE(embedder->IsAudioMuted());
   WebContentsAudioMutedObserver observer(guest);
   // If the guest hasn't attached yet, it may not have received the muting
   // update, in which case we should wait until it does.
   if (!guest->IsAudioMuted())
     observer.WaitForUpdate();
   EXPECT_TRUE(guest->IsAudioMuted());
 }
 
+// TODO(ekaramad): Remove this and revert the TEST_P to TEST_F once
+// crbug.com/578884 is resolved.
+INSTANTIATE_TEST_CASE_P(ForOOPIFAndNonOOPIFWebView,
+                        WebViewVisibilityTest,
+                        ::testing::Bool());
+
 // This test verifies that hiding the guest triggers WebContents::WasHidden().
-IN_PROC_BROWSER_TEST_F(WebViewVisibilityTest, GuestVisibilityChanged) {
+IN_PROC_BROWSER_TEST_P(WebViewVisibilityTest, GuestVisibilityChanged) {
   LoadAppWithGuest("web_view/visibility_changed");
 
   scoped_refptr<content::MessageLoopRunner> loop_runner(
       new content::MessageLoopRunner);
   WebContentsHiddenObserver observer(GetGuestWebContents(),
                                      loop_runner->QuitClosure());
 
   // Handled in platform_apps/web_view/visibility_changed/main.js
   SendMessageToEmbedder("hide-guest");
   if (!observer.hidden_observed())
     loop_runner->Run();
 }
 
 // This test verifies that hiding the embedder also hides the guest.
-IN_PROC_BROWSER_TEST_F(WebViewVisibilityTest, EmbedderVisibilityChanged) {
+IN_PROC_BROWSER_TEST_P(WebViewVisibilityTest, EmbedderVisibilityChanged) {
   LoadAppWithGuest("web_view/visibility_changed");
 
   scoped_refptr<content::MessageLoopRunner> loop_runner(
       new content::MessageLoopRunner);
   WebContentsHiddenObserver observer(GetGuestWebContents(),
                                      loop_runner->QuitClosure());
 
   // Handled in platform_apps/web_view/visibility_changed/main.js
   SendMessageToEmbedder("hide-embedder");
   if (!observer.hidden_observed())
@@ skipping 468 matching lines @@
 }
 
 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestReloadAfterTerminate) {
   TestHelper("testReloadAfterTerminate", "web_view/shim", NO_TEST_SERVER);
 }
 
 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestGetProcessId) {
   TestHelper("testGetProcessId", "web_view/shim", NO_TEST_SERVER);
 }
 
-IN_PROC_BROWSER_TEST_F(WebViewVisibilityTest, Shim_TestHiddenBeforeNavigation) {
+IN_PROC_BROWSER_TEST_P(WebViewVisibilityTest, Shim_TestHiddenBeforeNavigation) {
   TestHelper("testHiddenBeforeNavigation", "web_view/shim", NO_TEST_SERVER);
 }
 
 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestRemoveWebviewOnExit) {
   ASSERT_TRUE(StartEmbeddedTestServer());  // For serving guest pages.
 
   // Launch the app and wait until it's ready to load a test.
   LoadAndLaunchPlatformApp("web_view/shim", "Launched");
 
   content::WebContents* embedder_web_contents = GetFirstAppWindowWebContents();
@@ skipping 1692 matching lines @@
   // 4 tasks expected. The order is arbitrary.
   // Tab: about:blank,
   // Background Page: <webview> task manager test,
   // App: <webview> task manager test,
   // Webview: WebViewed test content.
   EXPECT_EQ(4U, task_manager.tasks().size());
   EXPECT_TRUE(HasExpectedGuestTask(task_manager, guest_contents));
 }
 
 #endif  // defined(ENABLE_TASK_MANAGER)