Prepare GuestView for removing swapped out RenderFrame.

components/guest_view/renderer/guest_view_request.cc

 // Copyright 2015 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 "components/guest_view/renderer/guest_view_request.h"
 
 #include "components/guest_view/common/guest_view_messages.h"
 #include "components/guest_view/renderer/guest_view_container.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_view.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
+#include "third_party/WebKit/public/web/WebRemoteFrame.h"
 #include "third_party/WebKit/public/web/WebScopedMicrotaskSuppression.h"
 #include "third_party/WebKit/public/web/WebView.h"
 
 namespace guest_view {
 
 GuestViewRequest::GuestViewRequest(GuestViewContainer* container,
                                    v8::Local<v8::Function> callback,
                                    v8::Isolate* isolate)
     : container_(container),
       callback_(isolate, callback),
@@ skipping 59 matching lines @@
     return;
 
   content::RenderView* guest_proxy_render_view =
       content::RenderView::FromRoutingID(base::get<1>(param));
   // TODO(fsamuel): Should we be reporting an error to JavaScript or DCHECKing?
   if (!guest_proxy_render_view)
     return;
 
   v8::HandleScope handle_scope(isolate());
   blink::WebFrame* frame = guest_proxy_render_view->GetWebView()->mainFrame();
-  v8::Local<v8::Value> window = frame->mainWorldScriptContext()->Global();
+  v8::Local<v8::Value> window;
+  if (frame->isWebLocalFrame()) {

[Fady Samuel, 2015/09/14 15:42:46]

nit: comment would be helpful.

+    window = frame->mainWorldScriptContext()->Global();
+  } else {
+    window =
+        frame->toWebRemoteFrame()->deprecatedMainWorldScriptContext()->Global();
+  }
 
   const int argc = 1;
   scoped_ptr<v8::Local<v8::Value>[]> argv(new v8::Local<v8::Value>[argc]);
   argv[0] = window;
 
   // Call the AttachGuest API's callback with the guest proxy as the first
   // parameter.
   ExecuteCallbackIfAvailable(argc, argv.Pass());
 }
 
@@ skipping 12 matching lines @@
     return;
 
   container()->render_frame()->DetachGuest(container()->element_instance_id());
 }
 
 void GuestViewDetachRequest::HandleResponse(const IPC::Message& message) {
   ExecuteCallbackIfAvailable(0 /* argc */, nullptr);
 }
 
 }  // namespace guest_view