Fix content script injection for cancelled loads with PlzNavigate.

extensions/renderer/script_injection_manager.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/script_injection_manager.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/weak_ptr.h"
 #include "base/values.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_frame_observer.h"
 #include "content/public/renderer/render_thread.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_messages.h"
 #include "extensions/common/extension_set.h"
 #include "extensions/renderer/extension_frame_helper.h"
 #include "extensions/renderer/extension_injection_host.h"
 #include "extensions/renderer/programmatic_script_injector.h"
 #include "extensions/renderer/renderer_extension_registry.h"
 #include "extensions/renderer/script_injection.h"
 #include "extensions/renderer/scripts_run_info.h"
 #include "extensions/renderer/web_ui_injection_host.h"
 #include "ipc/ipc_message_macros.h"
+#include "third_party/WebKit/public/platform/WebURLError.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebView.h"
 #include "url/gurl.h"
 
 namespace extensions {
 
 namespace {
 
@@ skipping 38 matching lines @@
   void DidFinishLoad() override;
   void FrameDetached() override;
   void OnDestruct() override;
 
   virtual void OnExecuteCode(const ExtensionMsg_ExecuteCode_Params& params);
   virtual void OnExecuteDeclarativeScript(int tab_id,
                                           const ExtensionId& extension_id,
                                           int script_id,
                                           const GURL& url);
   virtual void OnPermitScriptInjection(int64_t request_id);
+  void OnSet204Or205Error();
 
   // Tells the ScriptInjectionManager to run tasks associated with
   // document_idle.
   void RunIdle();
 
   void StartInjectScripts(UserScript::RunLocation run_location);
 
   // Indicate that the frame is no longer valid because it is starting
   // a new load or closing.
   void InvalidateAndResetFrame();
@@ skipping 19 matching lines @@
 
 bool ScriptInjectionManager::RFOHelper::OnMessageReceived(
     const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(ScriptInjectionManager::RFOHelper, message)
     IPC_MESSAGE_HANDLER(ExtensionMsg_ExecuteCode, OnExecuteCode)
     IPC_MESSAGE_HANDLER(ExtensionMsg_PermitScriptInjection,
                         OnPermitScriptInjection)
     IPC_MESSAGE_HANDLER(ExtensionMsg_ExecuteDeclarativeScript,
                         OnExecuteDeclarativeScript)
+    IPC_MESSAGE_HANDLER(ExtensionMsg_Set204Or205Error, OnSet204Or205Error)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void ScriptInjectionManager::RFOHelper::DidCreateNewDocument() {
   // A new document is going to be shown, so invalidate the old document state.
   // Check that the frame's state is known before invalidating the frame,
   // because it is possible that a script injection was scheduled before the
   // page was loaded, e.g. by navigating to a javascript: URL before the page
@@ skipping 89 matching lines @@
                                              script_id,
                                              url);
   }
 }
 
 void ScriptInjectionManager::RFOHelper::OnPermitScriptInjection(
     int64_t request_id) {
   manager_->HandlePermitScriptInjection(request_id);
 }
 
+void ScriptInjectionManager::RFOHelper::OnSet204Or205Error() {
+  DidFailProvisionalLoad(blink::WebURLError());

[Devlin, 2016/10/31 17:24:00]

In a non-plznavigate world, would a 204/205 cause DidFailProvisionalLoad?

[Devlin, 2016/10/31 17:28:14]

For more context, I'm asking because of the case of content scripts that want to
inject on every page, and try injecting on a page with a 204 status.  I think we
even have a test for this (ExecuteScriptApiTest.FrameWithHttp204), but it's
disabled for plz navigate.  I just wanna make sure we're not going to make this
harder on ourselves down the road. :)

+}
+
 void ScriptInjectionManager::RFOHelper::RunIdle() {
   // Only notify the manager if the frame hasn't either been removed or already
   // had idle run since the task to RunIdle() was posted.
   if (should_run_idle_) {
     should_run_idle_ = false;
     manager_->StartInjectScripts(render_frame(), UserScript::DOCUMENT_IDLE);
   }
 }
 
 void ScriptInjectionManager::RFOHelper::StartInjectScripts(
@@ skipping 257 matching lines @@
   ScriptsRunInfo scripts_run_info(injection->render_frame(),
                                   UserScript::RUN_DEFERRED);
   ScriptInjection::InjectionResult res = injection->OnPermissionGranted(
       &scripts_run_info);
   if (res == ScriptInjection::INJECTION_BLOCKED)
     running_injections_.push_back(std::move(injection));
   scripts_run_info.LogRun(activity_logging_enabled_);
 }
 
 }  // namespace extensions