Fixing WebViewVisibilityTests for OOPIF-<webview>.

chrome/browser/apps/guest_view/web_view_browsertest.cc

Index: chrome/browser/apps/guest_view/web_view_browsertest.cc
diff --git a/chrome/browser/apps/guest_view/web_view_browsertest.cc b/chrome/browser/apps/guest_view/web_view_browsertest.cc
index 613aef1296ec2118a26f018b8ba341b215895546..46833384a83d934cbc1e574756d8e374f3549cbf 100644
--- a/chrome/browser/apps/guest_view/web_view_browsertest.cc
+++ b/chrome/browser/apps/guest_view/web_view_browsertest.cc
@@ -728,7 +728,17 @@ class WebViewTest : public extensions::PlatformAppBrowserTest {
 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.
@@ -809,8 +819,14 @@ IN_PROC_BROWSER_TEST_F(WebViewTest, AudioMutesOnAttach) {
   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(
@@ -825,7 +841,7 @@ IN_PROC_BROWSER_TEST_F(WebViewVisibilityTest, GuestVisibilityChanged) {
 }
 
 // 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(
@@ -1314,7 +1330,7 @@ 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);
 }