Fix JavaScript alerts from frames with oopif on, after a cross-process click.

content/browser/web_contents/web_contents_impl_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 "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "content/browser/frame_host/navigation_entry_impl.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
@@ skipping 950 matching lines @@
   dialog_manager.Wait();
   EXPECT_EQ(GURL("http://a.com/title1.html"),
             GURL(dialog_manager.last_message()).ReplaceComponents(clear_port));
 
   // A dialog from the subframe.
   EXPECT_TRUE(
       content::ExecuteScript(frame->current_frame_host(), alert_location));
   dialog_manager.Wait();
   EXPECT_EQ("about:blank", dialog_manager.last_message());
 
-  // Navigate cross-domain.
+  // Navigate the subframe cross-site.
   NavigateFrameToURL(frame,
                      embedded_test_server()->GetURL("b.com", "/title2.html"));
   EXPECT_TRUE(WaitForLoadStop(wc));
 
   // A dialog from the subframe.
   EXPECT_TRUE(
       content::ExecuteScript(frame->current_frame_host(), alert_location));
   dialog_manager.Wait();
   EXPECT_EQ(GURL("http://b.com/title2.html"),
             GURL(dialog_manager.last_message()).ReplaceComponents(clear_port));
 
-  // Dialogs do not work with out-of-process iframes yet.
-  // http://crbug.com/453893
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    wc->SetDelegate(nullptr);
-    wc->SetJavaScriptDialogManagerForTesting(nullptr);
-    return;  // :(
-  }
-
   // A dialog from the main frame.
   EXPECT_TRUE(
       content::ExecuteScript(root->current_frame_host(), alert_location));
   dialog_manager.Wait();
   EXPECT_EQ(GURL("http://a.com/title1.html"),
             GURL(dialog_manager.last_message()).ReplaceComponents(clear_port));
 
+  // Navigate the top frame cross-site; ensure that dialogs work.
+  NavigateToURL(shell(),
+                embedded_test_server()->GetURL("c.com", "/title3.html"));
+  EXPECT_TRUE(WaitForLoadStop(wc));
+  EXPECT_TRUE(
+      content::ExecuteScript(root->current_frame_host(), alert_location));
+  dialog_manager.Wait();
+  EXPECT_EQ(GURL("http://c.com/title3.html"),
+            GURL(dialog_manager.last_message()).ReplaceComponents(clear_port));
+
+  // Navigate back; ensure that dialogs work.
+  wc->GetController().GoBack();
+  EXPECT_TRUE(WaitForLoadStop(wc));
+  EXPECT_TRUE(
+      content::ExecuteScript(root->current_frame_host(), alert_location));
+  dialog_manager.Wait();
+  EXPECT_EQ(GURL("http://a.com/title1.html"),
+            GURL(dialog_manager.last_message()).ReplaceComponents(clear_port));
+
   wc->SetDelegate(nullptr);
   wc->SetJavaScriptDialogManagerForTesting(nullptr);
 }
 
 }  // namespace content