Disable WebViewTest.InterstitialPageFocusedWidget with committed interstitials.

Bug: 752372
Change-Id: Icc7b51b58168982b0237cd6a3fe06259c8a6f7ac
Reviewed-on: https://chromium-review.googlesource.com/c/1348971
Commit-Queue: Lucas Gadani <lfg@chromium.org>
Reviewed-by: Carlos IL <carlosil@chromium.org>
Cr-Commit-Position: refs/heads/master@{#610502}

chrome/browser/apps/guest_view/web_view_browsertest.cc

@@ -1922,28 +1922,26 @@ IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_InterstitialPageRouteEvents) {
 #else
 #define MAYBE_InterstitialPageFocusedWidget InterstitialPageFocusedWidget
 #endif
-
 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_InterstitialPageFocusedWidget) {
+  // The purpose of this test is to ensure that the InterstitialPageImpl was
+  // properly attached to the guest which happens in
+  // WebContentsImpl::AttachInterstitialPage. With committed interstitials this
+  // is no longer necessary.
+  // TODO(carlosil): Remove this test once commited interstitials ships.
+  // https://crbug.com/755632.
+  if (AreCommittedInterstitialsEnabled())
+    return;
+
   // This test tests that a inner WebContents' InterstitialPage is properly
   // connected to an outer WebContents through a CrossProcessFrameConnector.
-
   InterstitialTestHelper();
 
   content::WebContents* outer_web_contents = GetFirstAppWindowWebContents();
   content::WebContents* guest_web_contents =
       GetGuestViewManager()->WaitForSingleGuestCreated();
 
-  content::RenderFrameHost* interstitial_main_frame;
-
-  if (AreCommittedInterstitialsEnabled()) {
-    // With committed interstitials, interstitials are no longer a special case
-    // so we can just use the main frame from the WebContents.
-    interstitial_main_frame = guest_web_contents->GetMainFrame();
-  } else {
-    interstitial_main_frame =
-        guest_web_contents->GetInterstitialPage()->GetMainFrame();
-  }
-
+  content::RenderFrameHost* interstitial_main_frame =
+      guest_web_contents->GetInterstitialPage()->GetMainFrame();
   content::RenderWidgetHost* interstitial_widget =
       interstitial_main_frame->GetRenderViewHost()->GetWidget();