Refactor renderer-side script injection

chrome/browser/extensions/active_script_controller.h

Index: chrome/browser/extensions/active_script_controller.h
diff --git a/chrome/browser/extensions/active_script_controller.h b/chrome/browser/extensions/active_script_controller.h
index 8877bdb701ab8dd5811d7a2146b549dfbe3fb2ae..1cd222769ed2b7bd14d73e71dc93c0afa2194509 100644
--- a/chrome/browser/extensions/active_script_controller.h
+++ b/chrome/browser/extensions/active_script_controller.h
@@ -89,13 +89,13 @@ class ActiveScriptController : public LocationBarController::ActionProvider,
   // Runs any pending injections for the corresponding extension.
   void RunPendingForExtension(const Extension* extension);
 
-  // Handle the RequestContentScriptPermission message.
-  void OnRequestContentScriptPermission(const std::string& extension_id,
-                                        int page_id,
-                                        int request_id);
+  // Handle the RequestScriptInjectionPermission message.
+  void OnRequestScriptInjectionPermission(const std::string& extension_id,
+                                          int page_id,
+                                          int request_id);
 
   // Grants permission for the given request to run.
-  void GrantContentScriptPermission(int request_id);
+  void PermitScriptInjection(int request_id);
 
   // content::WebContentsObserver implementation.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;