Fix copying from interstitial pages on OSX.

content/browser/frame_host/interstitial_page_impl.h

 // 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.
 
 #ifndef CONTENT_BROWSER_FRAME_HOST_INTERSTITIAL_PAGE_IMPL_H_
 #define CONTENT_BROWSER_FRAME_HOST_INTERSTITIAL_PAGE_IMPL_H_
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 45 matching lines @@
                        InterstitialPageDelegate* delegate);
   ~InterstitialPageImpl() override;
 
   // InterstitialPage implementation:
   void Show() override;
   void Hide() override;
   void DontProceed() override;
   void Proceed() override;
   RenderFrameHost* GetMainFrame() const override;
   InterstitialPageDelegate* GetDelegateForTesting() override;
+  WebContents* GetAsWebContents() override;

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

This doesn't seem right. This is not a WebContents type object, so
GetAsWebContents isn't meaningful. 

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

I think we have to do this to overwrite
RenderViewHostDelegate::GetAsWebContents(), which returns NULL. I can't get this
CL to work without it.

   void DontCreateViewForTesting() override;
   void SetSize(const gfx::Size& size) override;
   void Focus() override;
 
   // Allows the user to navigate away by disabling the interstitial, canceling
   // the pending request, and unblocking the hidden renderer.  The interstitial
   // will stay visible until the navigation completes.
   void CancelForNavigation();
 
   // Focus the first (last if reverse is true) element in the interstitial page.
   // Called when tab traversing.
   void FocusThroughTabTraversal(bool reverse);
 
   RenderWidgetHostView* GetView();
 
   // See description above field.
   void set_reload_on_dont_proceed(bool value) {
     reload_on_dont_proceed_ = value;
   }
   bool reload_on_dont_proceed() const { return reload_on_dont_proceed_; }
 
   // TODO(nasko): This should move to InterstitialPageNavigatorImpl, but in
   // the meantime make it public, so it can be called directly.
   void DidNavigate(
       RenderViewHost* render_view_host,
       const FrameHostMsg_DidCommitProvisionalLoad_Params& params);
+  FrameTree* GetFrameTree() override;

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

Why do you need to expose this? Can't we use GetMainFrame() whenever this is
needed?

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

This is what we came up with when we originally made this CL. :-P

Replacing

    interstitial_page->GetFrameTree()->root()->current_frame_host()

in WebContentsImpl::GetFocusedFrame()) with

    interstitial_page->GetMainFrame()

works. Is that safe?

 
  protected:
   // NotificationObserver method:
   void Observe(int type,
                const NotificationSource& source,
                const NotificationDetails& details) override;
 
   // RenderFrameHostDelegate implementation:
   bool OnMessageReceived(RenderFrameHost* render_frame_host,
                          const IPC::Message& message) override;
@@ skipping 28 matching lines @@
   void ShowCreatedWindow(int route_id,
                          WindowOpenDisposition disposition,
                          const gfx::Rect& initial_rect,
                          bool user_gesture) override;
   void ShowCreatedWidget(int route_id, const gfx::Rect& initial_rect) override;
   void ShowCreatedFullscreenWidget(int route_id) override;
 
   SessionStorageNamespace* GetSessionStorageNamespace(
       SiteInstance* instance) override;
 
-  FrameTree* GetFrameTree() override;
-
   // RenderWidgetHostDelegate implementation:
   void RenderWidgetDeleted(RenderWidgetHostImpl* render_widget_host) override;
   bool PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event,
                               bool* is_keyboard_shortcut) override;
   void HandleKeyboardEvent(const NativeWebKeyboardEvent& event) override;
 #if defined(OS_WIN)
   virtual gfx::NativeViewAccessible GetParentNativeViewAccessible() override;
 #endif
 
   bool enabled() const { return enabled_; }
@@ skipping 135 matching lines @@
   scoped_refptr<SessionStorageNamespace> session_storage_namespace_;
 
   base::WeakPtrFactory<InterstitialPageImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(InterstitialPageImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_INTERSTITIAL_PAGE_IMPL_H_