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..b309ac9ce42b9bde4c0e5acbfb02ee2c7f066825 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"
@@ -27,34 +28,36 @@ SharedUserScriptMaster::~SharedUserScriptMaster() {
 void SharedUserScriptMaster::OnExtensionLoaded(
     content::BrowserContext* browser_context,
     const Extension* extension) {
-  loader_.AddScripts(GetScriptsMetadata(extension));
+  BrowserUserScriptList list = GetScriptsMetadata(extension);
+  loader_.AddScripts(list);
 }
 
 void SharedUserScriptMaster::OnExtensionUnloaded(
     content::BrowserContext* browser_context,
     const Extension* extension,
     UnloadedExtensionInfo::Reason reason) {
-  const UserScriptList& script_list =
+  const ScriptMetadataList& 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<ScriptMetadata>& script : script_list)
+    scripts_to_remove.insert(UserScriptIDPair(script->id(), script->host_id()));
   loader_.RemoveScripts(scripts_to_remove);
 }
 
-const std::vector<UserScript> SharedUserScriptMaster::GetScriptsMetadata(
+BrowserUserScriptList SharedUserScriptMaster::GetScriptsMetadata(
     const Extension* extension) {
   bool incognito_enabled = util::IsIncognitoEnabled(extension->id(), profile_);
-  const UserScriptList& script_list =
+  const ScriptMetadataList& 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::vector<std::unique_ptr<BrowserUserScript>> script_vector;
+  script_vector.reserve(script_list.size());
+  for (const std::unique_ptr<ScriptMetadata>& meta : script_list) {
+    std::unique_ptr<BrowserUserScript> data(
+        new BrowserUserScript(*meta.get(), *meta.get()));
+    data->set_incognito_enabled(incognito_enabled);
+    script_vector.push_back(std::move(data));
   }
-
-  return scripts;
+  return script_vector;
 }
 
 }  // namespace extensions