Make UserScript non-copyable.

chrome/browser/extensions/shared_user_script_master.cc

Index: chrome/browser/extensions/shared_user_script_master.cc
diff --git a/chrome/browser/extensions/shared_user_script_master.cc b/chrome/browser/extensions/shared_user_script_master.cc
index 6a0dde4957736f3b9fd93535522f183094efaade..6de2649bbd603a19f3f8c752e256e2a71ece1012 100644
--- a/chrome/browser/extensions/shared_user_script_master.cc
+++ b/chrome/browser/extensions/shared_user_script_master.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/extensions/shared_user_script_master.h"
 
+#include "base/memory/ptr_util.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/manifest_handlers/content_scripts_handler.h"
@@ -37,24 +38,24 @@ void SharedUserScriptMaster::OnExtensionUnloaded(
   const UserScriptList& script_list =
       ContentScriptsInfo::GetContentScripts(extension);
   std::set<UserScriptIDPair> scripts_to_remove;
-  for (const UserScript& script : script_list)
-    scripts_to_remove.insert(UserScriptIDPair(script.id(), script.host_id()));
+  for (const std::unique_ptr<UserScript>& script : script_list)
+    scripts_to_remove.insert(UserScriptIDPair(script->id(), script->host_id()));
   loader_.RemoveScripts(scripts_to_remove);
 }
 
-const std::vector<UserScript> SharedUserScriptMaster::GetScriptsMetadata(
+std::unique_ptr<UserScriptList> SharedUserScriptMaster::GetScriptsMetadata(
     const Extension* extension) {
   bool incognito_enabled = util::IsIncognitoEnabled(extension->id(), profile_);
   const UserScriptList& script_list =
       ContentScriptsInfo::GetContentScripts(extension);
-  std::vector<UserScript> scripts;
-  scripts.reserve(script_list.size());
-  for (const UserScript& script : script_list) {
-    scripts.push_back(UserScript(script));
-    scripts.back().set_incognito_enabled(incognito_enabled);
+  std::unique_ptr<UserScriptList> script_vector(new UserScriptList());
+  script_vector->reserve(script_list.size());
+  for (const std::unique_ptr<UserScript>& meta : script_list) {
+    std::unique_ptr<UserScript> data = UserScript::CopyFrom(*meta);

[Devlin, 2016/08/17 20:40:39]

as much as I appreciate the |meta|,|data| tag team here, I think we can probably
name this something else - even just script_copy or something along those lines.
:)

[lazyboy, 2016/08/17 21:34:20]

Done.

+    data->set_incognito_enabled(incognito_enabled);
+    script_vector->push_back(std::move(data));
   }
-
-  return scripts;
+  return script_vector;
 }
 
 }  // namespace extensions