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

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

Index: chrome/browser/extensions/api/declarative_content/content_action.cc
diff --git a/chrome/browser/extensions/api/declarative_content/content_action.cc b/chrome/browser/extensions/api/declarative_content/content_action.cc
index e0ff006e16d05bc8418a6014f331bb6300debe48..ffc423824ae6e3cfb3134562c820f7ef036865cc 100644
--- a/chrome/browser/extensions/api/declarative_content/content_action.cc
+++ b/chrome/browser/extensions/api/declarative_content/content_action.cc
@@ -350,11 +350,10 @@ 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();
 }
 
@@ -362,9 +361,8 @@ RequestContentScript::RequestContentScript(
     DeclarativeUserScriptMaster* master,
     const Extension* extension,
     const ScriptData& script_data) {
-  InitScript(extension, script_data);
-
   master_ = master;
+  InitScript(extension, script_data);
   AddScript();
 }
 
@@ -376,7 +374,7 @@ RequestContentScript::~RequestContentScript() {
 void RequestContentScript::InitScript(const Extension* extension,
                                       const ScriptData& script_data) {
   script_.set_id(UserScript::GenerateUserScriptID());
-  script_.set_extension_id(extension->id());
+  script_.set_consumer_id(master_->consumer_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);