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..a526c355da1e1a50e5a4e0be4692834bcab5ccf9 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,19 +347,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 UserScript::File(

[Devlin, 2016/08/17 16:39:30]

nitty nit: I think we came to a semi-consensus to prefer MakeUnique

[lazyboy, 2016/08/17 18:55:52]

Done.

+        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 UserScript::File(
+        resource.extension_root(), resource.relative_path(), url)));
   }
 }
 
+void RequestContentScript::AddScript() {
+  DCHECK(master_);
+  master_->AddScript(UserScript::CopyFrom(script_));
+}
+
 void RequestContentScript::Apply(const ApplyInfo& apply_info) const {
   InstructRenderProcessToInject(apply_info.tab, apply_info.extension);
 }