Introduce HostID and de-couple Extensions from "script injection System" [browser side]

chrome/browser/extensions/api/declarative_content/content_action.h

 // Copyright (c) 2012 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 CHROME_BROWSER_EXTENSIONS_API_DECLARATIVE_CONTENT_CONTENT_ACTION_H_
 #define CHROME_BROWSER_EXTENSIONS_API_DECLARATIVE_CONTENT_CONTENT_ACTION_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 49 matching lines @@
                       ApplyInfo* apply_info) const = 0;
 
   // Factory method that instantiates a concrete ContentAction
   // implementation according to |json_action|, the representation of the
   // ContentAction as received from the extension API.
   // Sets |error| and returns NULL in case of a semantic error that cannot
   // be caught by schema validation. Sets |bad_message| and returns NULL
   // in case the input is syntactically unexpected.
   static scoped_refptr<ContentAction> Create(
       content::BrowserContext* browser_context,
+      const HostID& host_id,
       const Extension* extension,
       const base::Value& json_action,
       std::string* error,
       bool* bad_message);
 
   // Shared procedure for resetting error state within factories.
   static void ResetErrorData(std::string* error, bool* bad_message) {
     *error = "";
     *bad_message = false;
   }
 
   // Shared procedure for validating JSON data.
   static bool Validate(const base::Value& json_action,
                        std::string* error,
                        bool* bad_message,
                        const base::DictionaryValue** action_dict,
                        std::string* instance_type);
 
  protected:
   friend class base::RefCounted<ContentAction>;
   virtual ~ContentAction();
 };
 
 // Action that injects a content script.
 class RequestContentScript : public ContentAction {
  public:
   struct ScriptData;
 
   RequestContentScript(content::BrowserContext* browser_context,
+                       const HostID& host_id,

[Devlin, 2015/01/27 22:06:39]

This still kind of makes me sad that we plumb these through everywhere.  Can you
at least add a TODO(hanxi) to clean it up in subsequent patches?

                        const Extension* extension,
                        const ScriptData& script_data);
   RequestContentScript(DeclarativeUserScriptMaster* master,
+                       const HostID& host_id,
                        const Extension* extension,
                        const ScriptData& script_data);
 
   static scoped_refptr<ContentAction> Create(
       content::BrowserContext* browser_context,
+      const HostID& host_id,
       const Extension* extension,
       const base::DictionaryValue* dict,
       std::string* error,
       bool* bad_message);
 
   static scoped_refptr<ContentAction> CreateForTest(
       DeclarativeUserScriptMaster* master,
+      const HostID& host_id,
       const Extension* extension,
       const base::Value& json_action,
       std::string* error,
       bool* bad_message);
 
   static bool InitScriptData(const base::DictionaryValue* dict,
                              std::string* error,
                              bool* bad_message,
                              ScriptData* script_data);
 
   // Implementation of ContentAction:
   Type GetType() const override;
 
   void Apply(const std::string& extension_id,
              const base::Time& extension_install_time,
              ApplyInfo* apply_info) const override;
 
   void Reapply(const std::string& extension_id,
                const base::Time& extension_install_time,
                ApplyInfo* apply_info) const override;
 
   void Revert(const std::string& extension_id,
               const base::Time& extension_install_time,
               ApplyInfo* apply_info) const override;
 
  private:
-  void InitScript(const Extension* extension, const ScriptData& script_data);
+  void InitScript(const HostID& host_id,
+                  const Extension* extension,
+                  const ScriptData& script_data);
 
   void AddScript() {
     DCHECK(master_);
     master_->AddScript(script_);
   }
 
   ~RequestContentScript() override;
 
   void InstructRenderProcessToInject(content::WebContents* contents,
                                      const std::string& extension_id) const;
 
   UserScript script_;
   DeclarativeUserScriptMaster* master_;
 
   DISALLOW_COPY_AND_ASSIGN(RequestContentScript);
 };
 
 typedef DeclarativeActionSet<ContentAction> ContentActionSet;
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_DECLARATIVE_CONTENT_CONTENT_ACTION_H_