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

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

 // 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.
 
 #include "chrome/browser/extensions/api/declarative_content/content_action.h"
 
 #include <map>
 
 #include "base/lazy_instance.h"
 #include "base/strings/stringprintf.h"
@@ skipping 332 matching lines @@
             &script_data->match_about_blank));
   }
 
   return true;
 }
 
 RequestContentScript::RequestContentScript(
     content::BrowserContext* browser_context,
     const Extension* extension,
     const ScriptData& script_data) {
-  InitScript(extension, script_data);
-
   master_ = ExtensionSystem::Get(browser_context)
                 ->declarative_user_script_manager()
                 ->GetDeclarativeUserScriptMasterByID(extension->id());
+  InitScript(extension, script_data);
   AddScript();
 }
 
 RequestContentScript::RequestContentScript(
     DeclarativeUserScriptMaster* master,
     const Extension* extension,
     const ScriptData& script_data) {
+  master_ = master;
   InitScript(extension, script_data);
-
-  master_ = master;
   AddScript();
 }
 
 RequestContentScript::~RequestContentScript() {
   DCHECK(master_);
   master_->RemoveScript(script_);
 }
 
 void RequestContentScript::InitScript(const Extension* extension,
                                       const ScriptData& script_data) {
   script_.set_id(UserScript::GenerateUserScriptID());
+  script_.set_consumer_id(master_->consumer_id());
   script_.set_extension_id(extension->id());
   script_.set_run_location(UserScript::BROWSER_DRIVEN);
   script_.set_match_all_frames(script_data.all_frames);
   script_.set_match_about_blank(script_data.match_about_blank);
   for (std::vector<std::string>::const_iterator it =
            script_data.css_file_names.begin();
        it != script_data.css_file_names.end(); ++it) {
     GURL url = extension->GetResourceURL(*it);
     ExtensionResource resource = extension->GetResource(*it);
     script_.css_scripts().push_back(UserScript::File(
@@ skipping 107 matching lines @@
                              bool* bad_message,
                              const base::DictionaryValue** action_dict,
                              std::string* instance_type) {
   INPUT_FORMAT_VALIDATE(json_action.GetAsDictionary(action_dict));
   INPUT_FORMAT_VALIDATE(
       (*action_dict)->GetString(keys::kInstanceType, instance_type));
   return true;
 }
 
 }  // namespace extensions