Fix content script injection not working with PlzNavigate because of different navigation timings.

extensions/renderer/programmatic_script_injector.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/programmatic_script_injector.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/values.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/renderer/render_frame.h"
 #include "extensions/common/error_utils.h"
 #include "extensions/common/extension_messages.h"
 #include "extensions/common/manifest_constants.h"
 #include "extensions/common/permissions/api_permission.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "extensions/renderer/injection_host.h"
 #include "extensions/renderer/renderer_extension_registry.h"
 #include "extensions/renderer/script_context.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebScriptSource.h"
 
 namespace extensions {
 
 ProgrammaticScriptInjector::ProgrammaticScriptInjector(
-    const ExtensionMsg_ExecuteCode_Params& params,
-    content::RenderFrame* render_frame)
+    const ExtensionMsg_ExecuteCode_Params& params)
     : params_(new ExtensionMsg_ExecuteCode_Params(params)),
-      url_(
-          ScriptContext::GetDataSourceURLForFrame(render_frame->GetWebFrame())),
       finished_(false) {
-  if (url_.SchemeIs(url::kAboutScheme)) {
-    origin_for_about_error_ =
-        render_frame->GetWebFrame()->getSecurityOrigin().toString().utf8();
-  }
 }
 
 ProgrammaticScriptInjector::~ProgrammaticScriptInjector() {
 }
 
 UserScript::InjectionType ProgrammaticScriptInjector::script_type()
     const {
   return UserScript::PROGRAMMATIC_SCRIPT;
 }
 
@@ skipping 18 matching lines @@
 bool ProgrammaticScriptInjector::ShouldInjectCss(
     UserScript::RunLocation run_location,
     const std::set<std::string>& injected_stylesheets) const {
   return GetRunLocation() == run_location && !params_->is_javascript;
 }
 
 PermissionsData::AccessType ProgrammaticScriptInjector::CanExecuteOnFrame(
     const InjectionHost* injection_host,
     blink::WebLocalFrame* frame,
     int tab_id) const {
+  // Note: we calculate url_ now and not in the constructor because with
+  // PlzNavigate we won't have the URL at that point.
+  url_ = ScriptContext::GetDataSourceURLForFrame(frame);

[Devlin, 2016/11/01 23:39:32]

Do we document anywhere at which point we *do* have the url for the frame?  I
imagine it's fine here, but it would be good to know the exact before this/after
this moment.

[jam, 2016/11/01 23:47:03]

Sure I'll add a comment here.

+  if (url_.SchemeIs(url::kAboutScheme)) {
+    origin_for_about_error_ = frame->getSecurityOrigin().toString().utf8();
+  }
   GURL effective_document_url = ScriptContext::GetEffectiveDocumentURL(
       frame, frame->document().url(), params_->match_about_blank);
   if (params_->is_web_view) {
     if (frame->parent()) {
       // This is a subframe inside <webview>, so allow it.
       return PermissionsData::ACCESS_ALLOWED;
     }
 
     return effective_document_url == params_->webview_src
                ? PermissionsData::ACCESS_ALLOWED
@@ skipping 91 matching lines @@
   // frame deletions so nothing is left hanging).
   if (render_frame) {
     render_frame->Send(
         new ExtensionHostMsg_ExecuteCodeFinished(
             render_frame->GetRoutingID(), params_->request_id,
             error, url_, results_));
   }
 }
 
 }  // namespace extensions