Make UserScript non-copyable.

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/api/declarative_content/content_action.h"
 
 #include <map>
 
 #include "base/lazy_instance.h"
 #include "base/macros.h"
@@ skipping 313 matching lines @@
     const ScriptData& script_data) {
   HostID host_id(HostID::EXTENSIONS, extension->id());
   InitScript(host_id, extension, script_data);
 
   master_ = master;
   AddScript();
 }
 
 RequestContentScript::~RequestContentScript() {
   DCHECK(master_);
-  master_->RemoveScript(script_);
+  master_->RemoveScript(UserScriptIDPair(script_.id(), script_.host_id()));
 }
 
 void RequestContentScript::InitScript(const HostID& host_id,
                                       const Extension* extension,
                                       const ScriptData& script_data) {
   script_.set_id(UserScript::GenerateUserScriptID());
   script_.set_host_id(host_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);
   for (std::vector<std::string>::const_iterator it =
            script_data.css_file_names.begin();
        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);
 }
 
 void RequestContentScript::Reapply(const ApplyInfo& apply_info) const {
   InstructRenderProcessToInject(apply_info.tab, apply_info.extension);
 }
 
 void RequestContentScript::Revert(const ApplyInfo& apply_info) const {}
 
@@ skipping 64 matching lines @@
     return (*factory_method_iter->second)(
         browser_context, extension, action_dict, error);
 
   *error = base::StringPrintf(kInvalidInstanceTypeError, instance_type.c_str());
   return std::unique_ptr<ContentAction>();
 }
 
 ContentAction::ContentAction() {}
 
 }  // namespace extensions