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

extensions/renderer/programmatic_script_injector.h

Index: extensions/renderer/programmatic_script_injector.h
diff --git a/extensions/renderer/programmatic_script_injector.h b/extensions/renderer/programmatic_script_injector.h
index aa510840b2e53de01dc63b1e30e76f8b8181b980..6163ec6280328aa03278f3498d33da1f7258c480 100644
--- a/extensions/renderer/programmatic_script_injector.h
+++ b/extensions/renderer/programmatic_script_injector.h
@@ -23,8 +23,8 @@ 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:
@@ -71,11 +71,11 @@ class ProgrammaticScriptInjector : public ScriptInjector {
   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_;