Make UserScript non-copyable.

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 72d2aaa7db18d59a9099bf7428d3082fbc60afed..f4eb042d490b7e61adcfbeff25061bb1539c4dcc 100644
--- a/chrome/browser/extensions/api/declarative_content/content_action.cc
+++ b/chrome/browser/extensions/api/declarative_content/content_action.cc
@@ -21,6 +21,7 @@
 #include "content/public/browser/invalidate_type.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
+#include "extensions/browser/browser_user_script.h"
 #include "extensions/browser/declarative_user_script_manager.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/extension.h"
@@ -331,7 +332,7 @@ RequestContentScript::RequestContentScript(
 
 RequestContentScript::~RequestContentScript() {
   DCHECK(master_);
-  master_->RemoveScript(script_);
+  master_->RemoveScript(UserScriptIDPair(script_.id(), script_.host_id()));
 }
 
 void RequestContentScript::InitScript(const HostID& host_id,
@@ -347,19 +348,24 @@ void RequestContentScript::InitScript(const HostID& host_id,
        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(
-        resource.extension_root(), resource.relative_path(), url));
+    script_.css_scripts().push_back(base::WrapUnique(new UserScriptFileInfo(
+        resource.extension_root(), resource.relative_path(), url)));
   }
   for (std::vector<std::string>::const_iterator it =
            script_data.js_file_names.begin();
        it != script_data.js_file_names.end(); ++it) {
     GURL url = extension->GetResourceURL(*it);
     ExtensionResource resource = extension->GetResource(*it);
-    script_.js_scripts().push_back(UserScript::File(
-        resource.extension_root(), resource.relative_path(), url));
+    script_.js_scripts().push_back(base::WrapUnique(new UserScriptFileInfo(
+        resource.extension_root(), resource.relative_path(), url)));
   }
 }
 
+void RequestContentScript::AddScript() {
+  DCHECK(master_);
+  master_->AddScript(base::WrapUnique(new BrowserUserScript(script_, script_)));
+}
+
 void RequestContentScript::Apply(const ApplyInfo& apply_info) const {
   InstructRenderProcessToInject(apply_info.tab, apply_info.extension);
 }