Make UserScript non-copyable.

extensions/browser/extension_user_script_loader.cc

Index: extensions/browser/extension_user_script_loader.cc
diff --git a/extensions/browser/extension_user_script_loader.cc b/extensions/browser/extension_user_script_loader.cc
index b28821bb4e2a5dffffaaac1469a2e4aa56bbdc56..b39254df95ba86cc9b9a838876626976ccfd9a74 100644
--- a/extensions/browser/extension_user_script_loader.cc
+++ b/extensions/browser/extension_user_script_loader.cc
@@ -56,7 +56,7 @@ void VerifyContent(const scoped_refptr<ContentVerifier>& verifier,
 
 // Loads user scripts from the extension who owns these scripts.
 bool LoadScriptContent(const HostID& host_id,
-                       UserScript::File* script_file,
+                       BrowserScriptFile* script_file,
                        const SubstitutionMap* localization_messages,
                        const scoped_refptr<ContentVerifier>& verifier) {
   DCHECK(script_file);
@@ -124,23 +124,25 @@ SubstitutionMap* GetLocalizationMessages(
       iter->second.first, host_id.id(), iter->second.second);
 }
 
-void LoadUserScripts(UserScriptList* user_scripts,
+void LoadUserScripts(BrowserUserScriptList* user_scripts,
                      const ExtensionUserScriptLoader::HostsInfo& hosts_info,
                      const std::set<int>& added_script_ids,
                      const scoped_refptr<ContentVerifier>& verifier) {
-  for (UserScript& script : *user_scripts) {
-    if (added_script_ids.count(script.id()) == 0)
+  for (const std::unique_ptr<BrowserUserScript>& script : *user_scripts) {
+    if (added_script_ids.count(script->id()) == 0)
       continue;
-    for (UserScript::File& script_file : script.js_scripts()) {
-      if (script_file.GetContent().empty())
-        LoadScriptContent(script.host_id(), &script_file, nullptr, verifier);
+    for (const std::unique_ptr<BrowserScriptFile>& file :
+         script->js_scripts()) {
+      if (file->GetContent().empty())
+        LoadScriptContent(script->host_id(), file.get(), nullptr, verifier);
     }
-    if (script.css_scripts().size() > 0) {
+    if (script->css_scripts().size() > 0) {
       std::unique_ptr<SubstitutionMap> localization_messages(
-          GetLocalizationMessages(hosts_info, script.host_id()));
-      for (UserScript::File& script_file : script.css_scripts()) {
-        if (script_file.GetContent().empty()) {
-          LoadScriptContent(script.host_id(), &script_file,
+          GetLocalizationMessages(hosts_info, script->host_id()));
+      for (const std::unique_ptr<BrowserScriptFile>& file :
+           script->css_scripts()) {
+        if (file->GetContent().empty()) {
+          LoadScriptContent(script->host_id(), file.get(),
                             localization_messages.get(), verifier);
         }
       }
@@ -149,7 +151,7 @@ void LoadUserScripts(UserScriptList* user_scripts,
 }
 
 void LoadScriptsOnFileThread(
-    std::unique_ptr<UserScriptList> user_scripts,
+    std::unique_ptr<BrowserUserScriptList> user_scripts,
     const ExtensionUserScriptLoader::HostsInfo& hosts_info,
     const std::set<int>& added_script_ids,
     const scoped_refptr<ContentVerifier>& verifier,
@@ -190,18 +192,18 @@ ExtensionUserScriptLoader::~ExtensionUserScriptLoader() {
 }
 
 void ExtensionUserScriptLoader::LoadScriptsForTest(
-    UserScriptList* user_scripts) {
+    BrowserUserScriptList* user_scripts) {
   HostsInfo info;
   std::set<int> added_script_ids;
-  for (UserScript& script : *user_scripts)
-    added_script_ids.insert(script.id());
+  for (const std::unique_ptr<BrowserUserScript>& script : *user_scripts)
+    added_script_ids.insert(script->id());
 
   LoadUserScripts(user_scripts, info, added_script_ids,
                   nullptr /* no verifier for testing */);
 }
 
 void ExtensionUserScriptLoader::LoadScripts(
-    std::unique_ptr<UserScriptList> user_scripts,
+    std::unique_ptr<BrowserUserScriptList> user_scripts,
     const std::set<HostID>& changed_hosts,
     const std::set<int>& added_script_ids,
     LoadScriptsCallback callback) {