Make UserScript non-copyable.

extensions/browser/extension_user_script_loader.cc

 // Copyright 2015 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 "extensions/browser/extension_user_script_loader.h"
 
 #include <stddef.h>
 
 #include <set>
 #include <string>
@@ skipping 38 matching lines @@
       verifier->CreateJobFor(extension_id, extension_root, relative_path));
   if (job.get()) {
     job->Start();
     job->BytesRead(content.size(), content.data());
     job->DoneReading();
   }
 }
 
 // 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);
   std::string content;
   const base::FilePath& path = ExtensionResource::GetFilePath(
       script_file->extension_root(), script_file->relative_path(),
       ExtensionResource::SYMLINKS_MUST_RESOLVE_WITHIN_ROOT);
   if (path.empty()) {
     int resource_id = 0;
     if (ExtensionsBrowserClient::Get()
@@ skipping 47 matching lines @@
     const ExtensionUserScriptLoader::HostsInfo& hosts_info,
     const HostID& host_id) {
   ExtensionUserScriptLoader::HostsInfo::const_iterator iter =
       hosts_info.find(host_id);
   if (iter == hosts_info.end())
     return nullptr;
   return file_util::LoadMessageBundleSubstitutionMap(
       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);
         }
       }
     }
   }
 }
 
 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,
     UserScriptLoader::LoadScriptsCallback callback) {
   DCHECK(user_scripts.get());
   LoadUserScripts(user_scripts.get(), hosts_info, added_script_ids, verifier);
   std::unique_ptr<base::SharedMemory> memory =
       UserScriptLoader::Serialize(*user_scripts);
   content::BrowserThread::PostTask(
       content::BrowserThread::UI, FROM_HERE,
@@ skipping 20 matching lines @@
                          weak_factory_.GetWeakPtr()));
   } else {
     SetReady(true);
   }
 }
 
 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) {
   UpdateHostsInfo(changed_hosts);
 
   content::BrowserThread::PostTask(
       content::BrowserThread::FILE, FROM_HERE,
       base::Bind(&LoadScriptsOnFileThread, base::Passed(&user_scripts),
                  hosts_info_, added_script_ids, content_verifier_, callback));
 }
@@ skipping 20 matching lines @@
     const Extension* extension,
     UnloadedExtensionInfo::Reason reason) {
   hosts_info_.erase(HostID(HostID::EXTENSIONS, extension->id()));
 }
 
 void ExtensionUserScriptLoader::OnExtensionSystemReady() {
   SetReady(true);
 }
 
 }  // namespace extensions