[Extensions] Adjust script injection reporting to the browser side

extensions/renderer/script_injection.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_H_
 #define EXTENSIONS_RENDERER_SCRIPT_INJECTION_H_
 
 #include "base/basictypes.h"
 #include "base/macros.h"
 #include "extensions/common/user_script.h"
@@ skipping 37 matching lines @@
   // Returns true if the injection ran.
   bool OnPermissionGranted(const Extension* extension,
                            ScriptsRunInfo* scripts_run_info);
 
   // Accessors.
   blink::WebLocalFrame* web_frame() const { return web_frame_; }
   const std::string& extension_id() const { return extension_id_; }
   int64 request_id() const { return request_id_; }
 
  private:
-  // Send a message to the browser requesting permission to execute.
-  void RequestPermission();
+  // Sends a message to the browser, either that the script injection would
+  // like to inject, or to notify the browser that it is currently injecting.
+  void SendInjectionMessage(bool request_permission);
 
   // Injects the script, optionally populating |scripts_run_info|.
   void Inject(const Extension* extension, ScriptsRunInfo* scripts_run_info);
 
   // Inject any JS scripts into the |frame|, optionally populating
   // |execution_results|.
   void InjectJs(const Extension* extension,
                 blink::WebLocalFrame* frame,
                 base::ListValue* execution_results);
 
   // Inject any CSS source into the |frame|.
   void InjectCss(blink::WebLocalFrame* frame);
 
   // Notify that we will not inject, and mark it as acknowledged.
   void NotifyWillNotInject(ScriptInjector::InjectFailureReason reason);
 
+  // Notifies the browser of script injection, if appropriate.
+  void NotifyBrowserOfInjection(const Extension* extension);
+
   // The injector for this injection.
   scoped_ptr<ScriptInjector> injector_;
 
   // The (main) WebFrame into which this should inject the script.
   blink::WebLocalFrame* web_frame_;
 
   // The id of the associated extension.
   std::string extension_id_;
 
   // The location in the document load at which we inject the script.
   UserScript::RunLocation run_location_;
 
   // The tab id associated with the frame.
   int tab_id_;
 
   // This injection's request id. This will be -1 unless the injection is
   // currently waiting on permission.
   int64 request_id_;
 
   // Whether or not the injection is complete, either via injecting the script
   // or because it will never complete.
   bool complete_;
 
   DISALLOW_COPY_AND_ASSIGN(ScriptInjection);
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_RENDERER_SCRIPT_INJECTION_H_