Make UserScript non-copyable.

extensions/browser/web_ui_user_script_loader.cc

Index: extensions/browser/web_ui_user_script_loader.cc
diff --git a/extensions/browser/web_ui_user_script_loader.cc b/extensions/browser/web_ui_user_script_loader.cc
index 23f48132ddddf0835a78eed9f2f169e0ac03b12d..e86a50c839da4c2be82e1cae952145a0baff93ab 100644
--- a/extensions/browser/web_ui_user_script_loader.cc
+++ b/extensions/browser/web_ui_user_script_loader.cc
@@ -16,7 +16,7 @@
 namespace {
 
 void SerializeOnFileThread(
-    std::unique_ptr<extensions::UserScriptList> user_scripts,
+    std::unique_ptr<extensions::BrowserUserScriptList> user_scripts,
     extensions::UserScriptLoader::LoadScriptsCallback callback) {
   std::unique_ptr<base::SharedMemory> memory =
       extensions::UserScriptLoader::Serialize(*user_scripts);
@@ -48,20 +48,20 @@ WebUIUserScriptLoader::~WebUIUserScriptLoader() {
 }
 
 void WebUIUserScriptLoader::AddScripts(
-    const extensions::UserScriptList& scripts,
+    extensions::BrowserUserScriptList& scripts,
     int render_process_id,
     int render_view_id) {
   UserScriptRenderInfo info(render_process_id, render_view_id);
-  for (const extensions::UserScript& script : scripts) {
+  for (const std::unique_ptr<extensions::BrowserUserScript>& script : scripts) {
     script_render_info_map_.insert(
-        std::pair<int, UserScriptRenderInfo>(script.id(), info));
+        std::pair<int, UserScriptRenderInfo>(script->id(), info));
   }
 
   extensions::UserScriptLoader::AddScripts(scripts);
 }
 
 void WebUIUserScriptLoader::LoadScripts(
-    std::unique_ptr<extensions::UserScriptList> user_scripts,
+    std::unique_ptr<extensions::BrowserUserScriptList> user_scripts,
     const std::set<HostID>& changed_hosts,
     const std::set<int>& added_script_ids,
     LoadScriptsCallback callback) {
@@ -74,11 +74,12 @@ void WebUIUserScriptLoader::LoadScripts(
   // fetch tasks.
   DCHECK_EQ(0u, complete_fetchers_);
 
-  for (extensions::UserScript& script : *user_scripts_cache_) {
-    if (added_script_ids.count(script.id()) == 0)
+  for (const std::unique_ptr<extensions::BrowserUserScript>& script :
+       *user_scripts_cache_) {
+    if (added_script_ids.count(script->id()) == 0)
       continue;
 
-    auto iter = script_render_info_map_.find(script.id());
+    auto iter = script_render_info_map_.find(script->id());
     DCHECK(iter != script_render_info_map_.end());
     int render_process_id = iter->second.render_process_id;
     int render_view_id = iter->second.render_view_id;
@@ -87,12 +88,12 @@ void WebUIUserScriptLoader::LoadScripts(
         content::RenderProcessHost::FromID(render_process_id)
             ->GetBrowserContext();
 
-    CreateWebUIURLFetchers(&script.js_scripts(), browser_context,
+    CreateWebUIURLFetchers(&script->js_scripts(), browser_context,
                            render_process_id, render_view_id);
-    CreateWebUIURLFetchers(&script.css_scripts(), browser_context,
+    CreateWebUIURLFetchers(&script->css_scripts(), browser_context,
                            render_process_id, render_view_id);
 
-    script_render_info_map_.erase(script.id());
+    script_render_info_map_.erase(script->id());
   }
 
   // If no fetch is needed, call OnWebUIURLFetchComplete directly.
@@ -105,26 +106,27 @@ void WebUIUserScriptLoader::LoadScripts(
 }
 
 void WebUIUserScriptLoader::CreateWebUIURLFetchers(
-    extensions::UserScript::FileList* script_files,
+    extensions::BrowserScriptFileList* script_files,
     content::BrowserContext* browser_context,
     int render_process_id,
     int render_view_id) {
-  for (extensions::UserScript::File& file : *script_files) {
-    if (file.GetContent().empty()) {
+  for (const std::unique_ptr<extensions::BrowserScriptFile>& file :
+       *script_files) {
+    if (file->GetContent().empty()) {
       // The WebUIUserScriptLoader owns these WebUIURLFetchers. Once the
       // loader is destroyed, all the fetchers will be destroyed. Therefore,
       // we are sure it is safe to use base::Unretained(this) here.
       std::unique_ptr<WebUIURLFetcher> fetcher(new WebUIURLFetcher(
-          browser_context, render_process_id, render_view_id, file.url(),
+          browser_context, render_process_id, render_view_id, file->url(),
           base::Bind(&WebUIUserScriptLoader::OnSingleWebUIURLFetchComplete,
-                     base::Unretained(this), &file)));
+                     base::Unretained(this), file.get())));
       fetchers_.push_back(std::move(fetcher));
     }
   }
 }
 
 void WebUIUserScriptLoader::OnSingleWebUIURLFetchComplete(
-    extensions::UserScript::File* script_file,
+    extensions::BrowserScriptFile* script_file,
     bool success,
     const std::string& data) {
   if (success) {