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..9bc601069783abd0f770c65e8d5285ff220a8d57 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,7 +28,8 @@ SharedUserScriptMaster::~SharedUserScriptMaster() {
 void SharedUserScriptMaster::OnExtensionLoaded(
     content::BrowserContext* browser_context,
     const Extension* extension) {
-  loader_.AddScripts(GetScriptsMetadata(extension));
+  UserScriptList list = GetScriptsMetadata(extension);
+  loader_.AddScripts(list);

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

nit: inline list?

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

We need an l-value here since AddScripts takes a (non-const) ref.

 }
 
 void SharedUserScriptMaster::OnExtensionUnloaded(
@@ -37,24 +39,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(
+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::vector<std::unique_ptr<UserScript>> script_vector;

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

nit: UserScriptList?

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

Done.

+  script_vector.reserve(script_list.size());
+  for (const std::unique_ptr<UserScript>& meta : script_list) {
+    std::unique_ptr<UserScript> data = UserScript::CopyFrom(*meta);
+    data->set_incognito_enabled(incognito_enabled);

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

(Not related to this patch set, but...)
This seems kind of silly.  This has nothing to do with the user script at all -
it's a state of the extension.  Looking at its uses, it's only for the renderer
where we check if a script should inject.  That seems like something we should
determine from extension state on the renderer side, rather than currying into
each user script (which would also simplify this and the user script object). 
Can we add a TODO here or in user_script.h to remove this somehow?

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

Added TODO in user_script.h, will follow up.

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