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

extensions/renderer/programmatic_script_injector.h

 // 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.
 
 #ifndef EXTENSIONS_RENDERER_PROGRAMMATIC_SCRIPT_INJECTOR_H_
 #define EXTENSIONS_RENDERER_PROGRAMMATIC_SCRIPT_INJECTOR_H_
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/values.h"
 #include "extensions/renderer/script_injection.h"
 #include "url/gurl.h"
 
 struct ExtensionMsg_ExecuteCode_Params;
 
 namespace content {
 class RenderFrame;
 }
 
 namespace extensions {
 
 // A ScriptInjector to handle tabs.executeScript().
 class ProgrammaticScriptInjector : public ScriptInjector {
  public:
-  ProgrammaticScriptInjector(const ExtensionMsg_ExecuteCode_Params& params,
-                             content::RenderFrame* render_frame);
+  explicit ProgrammaticScriptInjector(
+      const ExtensionMsg_ExecuteCode_Params& params);
   ~ProgrammaticScriptInjector() override;
 
  private:
   // ScriptInjector implementation.
   UserScript::InjectionType script_type() const override;
   bool ShouldExecuteInMainWorld() const override;
   bool IsUserGesture() const override;
   bool ExpectsResults() const override;
   bool ShouldInjectJs(
       UserScript::RunLocation run_location,
@@ skipping 26 matching lines @@
   UserScript::RunLocation GetRunLocation() const;
 
   // Notify the browser that the script was injected (or never will be), and
   // send along any results or errors.
   void Finish(const std::string& error, content::RenderFrame* render_frame);
 
   // The parameters for injecting the script.
   std::unique_ptr<ExtensionMsg_ExecuteCode_Params> params_;
 
   // The url of the frame into which we are injecting.
-  GURL url_;
+  mutable GURL url_;

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

It makes me sad that these are mutable.  I think having
ScriptInjector::CanExecuteOnFrame be const is mostly legacy (from when there was
a single ScriptInjector).  I'd slightly prefer just removing the const from
there, rather than introducing mutable members.

Mind doing that here?  Or putting
// TODO(devlin): These shouldn't need to be mutable.
?

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

agreed I prefer mutable too, I thought there was a reason it had to be const.
updated.

 
   // The serialization of the frame's origin if the frame is an about:-URL. This
   // is used to provide user-friendly messages.
-  std::string origin_for_about_error_;
+  mutable std::string origin_for_about_error_;
 
   // The results of the script execution.
   base::ListValue results_;
 
   // Whether or not this script injection has finished.
   bool finished_;
 
   DISALLOW_COPY_AND_ASSIGN(ProgrammaticScriptInjector);
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_RENDERER_PROGRAMMATIC_SCRIPT_INJECTOR_H_