Make UserScript non-copyable.

extensions/renderer/user_script_injector.cc

Index: extensions/renderer/user_script_injector.cc
diff --git a/extensions/renderer/user_script_injector.cc b/extensions/renderer/user_script_injector.cc
index 21a59eac30fa4bd3e03c928090db5f13e6189ed9..acc2d1dfe28e9d7abdb84cbb98ba8beffd1f0744 100644
--- a/extensions/renderer/user_script_injector.cc
+++ b/extensions/renderer/user_script_injector.cc
@@ -85,7 +85,7 @@ base::LazyInstance<GreasemonkeyApiJsString> g_greasemonkey_api =
 
 }  // namespace
 
-UserScriptInjector::UserScriptInjector(const UserScript* script,
+UserScriptInjector::UserScriptInjector(const RendererUserScript* script,
                                        UserScriptSet* script_list,
                                        bool is_declarative)
     : script_(script),
@@ -101,7 +101,7 @@ UserScriptInjector::~UserScriptInjector() {
 
 void UserScriptInjector::OnUserScriptsUpdated(
     const std::set<HostID>& changed_hosts,
-    const std::vector<std::unique_ptr<UserScript>>& scripts) {
+    const std::vector<std::unique_ptr<RendererUserScript>>& scripts) {
   // If the host causing this injection changed, then this injection
   // will be removed, and there's no guarantee the backing script still exists.
   if (changed_hosts.count(host_id_) > 0) {
@@ -109,7 +109,7 @@ void UserScriptInjector::OnUserScriptsUpdated(
     return;
   }
 
-  for (const std::unique_ptr<UserScript>& script : scripts) {
+  for (const std::unique_ptr<RendererUserScript>& script : scripts) {
     // We need to compare to |script_id_| (and not to script_->id()) because the
     // old |script_| may be deleted by now.
     if (script->id() == script_id_) {
@@ -202,11 +202,10 @@ std::vector<blink::WebScriptSource> UserScriptInjector::GetJsSources(
 
   DCHECK_EQ(script_->run_location(), run_location);
 
-  const UserScript::FileList& js_scripts = script_->js_scripts();
+  const std::vector<std::unique_ptr<RendererScriptFile>>& js_scripts =
+      script_->js_scripts();
 
-  for (UserScript::FileList::const_iterator iter = js_scripts.begin();
-       iter != js_scripts.end();
-       ++iter) {
+  for (const std::unique_ptr<RendererScriptFile>& iter : js_scripts) {
     std::string content = iter->GetContent().as_string();
 
     // We add this dumb function wrapper for user scripts to emulate what
@@ -235,10 +234,9 @@ std::vector<std::string> UserScriptInjector::GetCssSources(
   if (!script_)
     return sources;
 
-  const UserScript::FileList& css_scripts = script_->css_scripts();
-  for (UserScript::FileList::const_iterator iter = css_scripts.begin();
-       iter != css_scripts.end();
-       ++iter) {
+  const std::vector<std::unique_ptr<RendererScriptFile>>& css_scripts =
+      script_->css_scripts();
+  for (const std::unique_ptr<RendererScriptFile>& iter : css_scripts) {
     sources.push_back(iter->GetContent().as_string());
   }
   return sources;
@@ -251,11 +249,10 @@ void UserScriptInjector::GetRunInfo(
     return;
 
   if (ShouldInjectJs(run_location)) {
-    const UserScript::FileList& js_scripts = script_->js_scripts();
+    const std::vector<std::unique_ptr<RendererScriptFile>>& js_scripts =
+        script_->js_scripts();
     scripts_run_info->num_js += js_scripts.size();
-    for (UserScript::FileList::const_iterator iter = js_scripts.begin();
-         iter != js_scripts.end();
-         ++iter) {
+    for (const std::unique_ptr<RendererScriptFile>& iter : js_scripts) {
       scripts_run_info->executing_scripts[host_id_.id()].insert(
           iter->url().path());
     }