Implement <webview>.addContentScript/removeContentScript API [2]

extensions/browser/declarative_user_script_master.cc

Index: extensions/browser/declarative_user_script_master.cc
diff --git a/extensions/browser/declarative_user_script_master.cc b/extensions/browser/declarative_user_script_master.cc
index 130e9ba4b87c54b8805fc6128871adae40f315bf..a6207122b39a97c4c83d1c898e57388cbd2ad7c3 100644
--- a/extensions/browser/declarative_user_script_master.cc
+++ b/extensions/browser/declarative_user_script_master.cc
@@ -7,16 +7,25 @@
 #include <set>
 
 #include "content/public/browser/browser_context.h"
+#include "extensions/browser/extension_user_script_loader.h"
+#include "extensions/browser/web_ui_user_script_loader.h"
 
 namespace extensions {
 
 DeclarativeUserScriptMaster::DeclarativeUserScriptMaster(
     content::BrowserContext* browser_context,
     const HostID& host_id)
-    : host_id_(host_id),
-      loader_(browser_context,
-              host_id,
-              false /* listen_for_extension_system_loaded */) {
+    : host_id_(host_id) {
+  switch (host_id_.type()) {
+    case HostID::EXTENSIONS:
+      loader_.reset(new ExtensionUserScriptLoader(
+          browser_context, host_id,
+          false /* listen_for_extension_system_loaded */));
+      break;
+    case HostID::WEBUI:
+      loader_.reset(new WebUIUserScriptLoader(browser_context, host_id));
+      break;
+  }
 }
 
 DeclarativeUserScriptMaster::~DeclarativeUserScriptMaster() {
@@ -25,27 +34,29 @@ DeclarativeUserScriptMaster::~DeclarativeUserScriptMaster() {
 void DeclarativeUserScriptMaster::AddScript(const UserScript& script) {
   std::set<UserScript> set;
   set.insert(script);
-  loader_.AddScripts(set);
+  loader_->AddScripts(set);
 }
 
 void DeclarativeUserScriptMaster::AddScripts(
-    const std::set<UserScript>& scripts) {
-  loader_.AddScripts(scripts);
+    const std::set<UserScript>& scripts,
+    int render_process_id,
+    int render_view_id) {
+  loader_->AddScripts(scripts, render_process_id, render_view_id);
 }
 
 void DeclarativeUserScriptMaster::RemoveScript(const UserScript& script) {
   std::set<UserScript> set;
   set.insert(script);
-  loader_.RemoveScripts(set);
+  loader_->RemoveScripts(set);
 }
 
 void DeclarativeUserScriptMaster::RemoveScripts(
     const std::set<UserScript>& scripts) {
-  loader_.RemoveScripts(scripts);
+  loader_->RemoveScripts(scripts);
 }
 
 void DeclarativeUserScriptMaster::ClearScripts() {
-  loader_.ClearScripts();
+  loader_->ClearScripts(true);
 }
 
 }  // namespace extensions