Stop injection when injections are invalidated

extensions/renderer/script_injection_manager.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_SCRIPT_INJECTION_MANAGER_H_
 #define EXTENSIONS_RENDERER_SCRIPT_INJECTION_MANAGER_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 35 matching lines @@
 
   void set_activity_logging_enabled(bool enabled) {
     activity_logging_enabled_ = enabled;
   }
 
  private:
   // A RenderFrameObserver implementation which watches the various render
   // frames in order to notify the ScriptInjectionManager of different
   // document load states and IPCs.
   class RFOHelper;
+  class ScriptInjectionWatcher;
 
   using FrameStatusMap =
       std::map<content::RenderFrame*, UserScript::RunLocation>;
 
   using ScriptInjectionVector = std::vector<std::unique_ptr<ScriptInjection>>;
 
   // Notifies that an injection has been finished.
   void OnInjectionFinished(ScriptInjection* injection);
 
   // UserScriptSetManager::Observer implementation.
@@ skipping 30 matching lines @@
                                       int script_id,
                                       const GURL& url);
 
   // Handle the GrantInjectionPermission extension message.
   void HandlePermitScriptInjection(int64_t request_id);
 
   // The map of active web frames to their corresponding statuses. The
   // RunLocation of the frame corresponds to the last location that has ran.
   FrameStatusMap frame_statuses_;
 
-  // The frames currently being injected into, so long as that frame is valid.
-  std::set<content::RenderFrame*> active_injection_frames_;
-
   // The collection of RFOHelpers.
   std::vector<std::unique_ptr<RFOHelper>> rfo_helpers_;
 
   // The set of UserScripts associated with extensions. Owned by the Dispatcher.
   UserScriptSetManager* user_script_set_manager_;
 
   // Pending injections which are waiting for either the proper run location or
   // user consent.
   ScriptInjectionVector pending_injections_;
 
   // Running injections which are waiting for async callbacks from blink.
   ScriptInjectionVector running_injections_;
 
+  // Tracks injections that are about to be injected. Injections are added
+  // right before injection, and removed immediately after.
+  std::vector<ScriptInjectionWatcher*> injection_watchers_;
+
   // Whether or not dom activity should be logged for scripts injected.
   bool activity_logging_enabled_ = false;
 
   ScopedObserver<UserScriptSetManager, UserScriptSetManager::Observer>
       user_script_set_manager_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(ScriptInjectionManager);
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_RENDERER_SCRIPT_INJECTION_MANAGER_H_