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..6da57a16b916dc7249e752525e0a4b7801d53355 100644
--- a/chrome/browser/extensions/api/declarative_content/content_action.cc
+++ b/chrome/browser/extensions/api/declarative_content/content_action.cc
@@ -331,7 +331,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,7 +347,7 @@ 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(
+    script_.css_scripts().push_back(base::MakeUnique<UserScript::File>(
         resource.extension_root(), resource.relative_path(), url));
   }
   for (std::vector<std::string>::const_iterator it =
@@ -355,11 +355,16 @@ void RequestContentScript::InitScript(const HostID& host_id,
        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(
+    script_.js_scripts().push_back(base::MakeUnique<UserScript::File>(
         resource.extension_root(), resource.relative_path(), url));
   }
 }
 
+void RequestContentScript::AddScript() {
+  DCHECK(master_);
+  master_->AddScript(UserScript::CopyMetadataFrom(script_));
+}
+
 void RequestContentScript::Apply(const ApplyInfo& apply_info) const {
   InstructRenderProcessToInject(apply_info.tab, apply_info.extension);
 }