Fix copying from interstitial pages on OSX.

content/browser/web_contents/web_contents_impl_unittest.cc

Index: content/browser/web_contents/web_contents_impl_unittest.cc
diff --git a/content/browser/web_contents/web_contents_impl_unittest.cc b/content/browser/web_contents/web_contents_impl_unittest.cc
index 946cae8331386b9b77d58161533a0de4fb8539ca..4ec7e71cf04bbb625d934600d700635507f92f8c 100644
--- a/content/browser/web_contents/web_contents_impl_unittest.cc
+++ b/content/browser/web_contents/web_contents_impl_unittest.cc
@@ -2274,6 +2274,29 @@ TEST_F(WebContentsImplTest, NoJSMessageOnInterstitials) {
   EXPECT_TRUE(contents()->last_dialog_suppressed_);
 }
 
+// Tests that GetFocusedFrame() does not return NULL for an interstitial.
+// This is is needed for copying from interstitials on OSX: crbug.com/415784
+TEST_F(WebContentsImplTest, CanGetFocusedFrameInInterstitial) {
+  // Show an interstitial.
+  TestInterstitialPage::InterstitialState state =
+      TestInterstitialPage::INVALID;
+  bool deleted = false;
+  GURL interstitial_url("http://interstitial");
+  TestInterstitialPage* interstitial =
+      new TestInterstitialPage(contents(), true, interstitial_url,
+                               &state, &deleted);
+  TestInterstitialPageStateGuard state_guard(interstitial);
+  interstitial->Show();
+
+  // Now let's make the interstitial navigation commit.
+  interstitial->TestDidNavigate(1, interstitial_url);
+
+  // Test that we can get GetFocusedFrame().
+  EXPECT_NE(nullptr, interstitial->GetAsWebContents()->GetFocusedFrame());

[nasko, 2015/04/22 05:07:45]

Let's add accessor that exposes the associated WebContents in
TestInterstitialPage. This way it is only usable in tests and we avoid APIs on
the original object that can be misused.

[lgarron, 2015/04/22 07:19:54]

As of a week ago, InterstitialPageImpl has a protected web_contents() function
that makes this easy, but given that we need GetAsWebContents() [see above] to
be a public override I think it makes sense to keep this?

+

[nasko, 2015/04/22 05:07:45]

I think we can another expectation here. The RenderFrameHost we get back from
WebContents::GetFocusedFrame() while an interstitial page is displayed should be
different than WebContents::GetMainFrame(), not just non-null.

[lgarron, 2015/04/22 07:19:54]

Done.

+  EXPECT_FALSE(deleted);
+}
+
 // Makes sure that if the source passed to CopyStateFromAndPrune has an
 // interstitial it isn't copied over to the destination.
 TEST_F(WebContentsImplTest, CopyStateFromAndPruneSourceInterstitial) {