Move MainWorldScriptContext accessor/method from WebFrame to WebLocalFrame.

extensions/renderer/extension_helper.cc

 // Copyright 2014 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 "extensions/renderer/extension_helper.h"
 
 #include <stddef.h>
 
 #include "content/public/renderer/render_view.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension_messages.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "extensions/common/url_pattern_set.h"
 #include "extensions/renderer/api/automation/automation_api_helper.h"
 #include "extensions/renderer/dispatcher.h"
 #include "third_party/WebKit/public/platform/WebURLRequest.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
+#include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebView.h"
 
 namespace extensions {
 
 ExtensionHelper::ExtensionHelper(content::RenderView* render_view,
                                  Dispatcher* dispatcher)
     : content::RenderViewObserver(render_view),
       dispatcher_(dispatcher) {
   // Lifecycle managed by RenderViewObserver.
   new AutomationApiHelper(render_view);
@@ skipping 32 matching lines @@
 }
 
 void ExtensionHelper::OnSetFrameName(const std::string& name) {
   blink::WebView* web_view = render_view()->GetWebView();
   if (web_view)
     web_view->MainFrame()->SetName(blink::WebString::FromUTF8(name));
 }
 
 void ExtensionHelper::OnAppWindowClosed() {
   v8::HandleScope scope(v8::Isolate::GetCurrent());
-  v8::Local<v8::Context> v8_context =
-      render_view()->GetWebView()->MainFrame()->MainWorldScriptContext();
+  if (!render_view()->GetWebView()->MainFrame()->IsWebLocalFrame()) {

[dcheng, 2017/06/06 19:57:17]

Is this actually something we need to handle? I don't quite understand when this
helper is installed.

[Łukasz Anforowicz, 2017/06/07 20:35:07]

Good point - ExtensionMsg_AppWindowClosed is sent from
AppWindowContentsImpl::NativeWindowClosed and always targets the non-swapped-out
RenderView.  So - I've changed the above into a DCHECK.

+    NOTREACHED();
+    return;
+  }
+  v8::Local<v8::Context> v8_context = render_view()
+                                          ->GetWebView()
+                                          ->MainFrame()
+                                          ->ToWebLocalFrame()
+                                          ->MainWorldScriptContext();
   ScriptContext* script_context =
       dispatcher_->script_context_set().GetByV8Context(v8_context);
   if (!script_context)
     return;
   script_context->module_system()->CallModuleMethodSafe("app.window",
                                                         "onAppWindowClosed");
 }
 
 }  // namespace extensions