Make UserScript non-copyable.

extensions/renderer/user_script_set.cc

 // Copyright 2014 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/renderer/user_script_set.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 40 matching lines @@
 void UserScriptSet::AddObserver(Observer* observer) {
   observers_.AddObserver(observer);
 }
 
 void UserScriptSet::RemoveObserver(Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
 void UserScriptSet::GetActiveExtensionIds(
     std::set<std::string>* ids) const {
-  for (const std::unique_ptr<UserScript>& script : scripts_) {
+  for (const std::unique_ptr<RendererUserScript>& script : scripts_) {
     if (script->host_id().type() != HostID::EXTENSIONS)
       continue;
     DCHECK(!script->extension_id().empty());
     ids->insert(script->extension_id());
   }
 }
 
 void UserScriptSet::GetInjections(
     std::vector<std::unique_ptr<ScriptInjection>>* injections,
     content::RenderFrame* render_frame,
     int tab_id,
     UserScript::RunLocation run_location,
     bool log_activity) {
   GURL document_url = GetDocumentUrlForFrame(render_frame->GetWebFrame());
-  for (const std::unique_ptr<UserScript>& script : scripts_) {
+  for (const std::unique_ptr<RendererUserScript>& script : scripts_) {
     std::unique_ptr<ScriptInjection> injection = GetInjectionForScript(
         script.get(), render_frame, tab_id, run_location, document_url,
         false /* is_declarative */, log_activity);
     if (injection.get())
       injections->push_back(std::move(injection));
   }
 }
 
 bool UserScriptSet::UpdateUserScripts(base::SharedMemoryHandle shared_memory,
                                       const std::set<HostID>& changed_hosts,
@@ skipping 21 matching lines @@
   // Unpickle scripts.
   uint32_t num_scripts = 0;
   base::Pickle pickle(reinterpret_cast<char*>(shared_memory_->memory()),
                       pickle_size);
   base::PickleIterator iter(pickle);
   CHECK(iter.ReadUInt32(&num_scripts));
 
   scripts_.clear();
   scripts_.reserve(num_scripts);
   for (uint32_t i = 0; i < num_scripts; ++i) {
-    std::unique_ptr<UserScript> script(new UserScript());
+    std::unique_ptr<RendererUserScript> script(new RendererUserScript());
     script->Unpickle(pickle, &iter);
 
     // Note that this is a pointer into shared memory. We don't own it. It gets
     // cleared up when the last renderer or browser process drops their
     // reference to the shared memory.
     for (size_t j = 0; j < script->js_scripts().size(); ++j) {
       const char* body = NULL;
       int body_length = 0;
       CHECK(iter.ReadData(&body, &body_length));
-      script->js_scripts()[j].set_external_content(
+      script->js_scripts()[j]->set_external_content(
           base::StringPiece(body, body_length));
     }
     for (size_t j = 0; j < script->css_scripts().size(); ++j) {
       const char* body = NULL;
       int body_length = 0;
       CHECK(iter.ReadData(&body, &body_length));
-      script->css_scripts()[j].set_external_content(
+      script->css_scripts()[j]->set_external_content(
           base::StringPiece(body, body_length));
     }
 
     if (only_inject_incognito && !script->is_incognito_enabled())
       continue;  // This script shouldn't run in an incognito tab.
 
     const Extension* extension =
         RendererExtensionRegistry::Get()->GetByID(script->extension_id());
     if (whitelisted_only &&
         (!extension ||
          !PermissionsData::CanExecuteScriptEverywhere(extension))) {
       continue;
     }
 
     scripts_.push_back(std::move(script));
   }
 
   FOR_EACH_OBSERVER(Observer, observers_,
                     OnUserScriptsUpdated(changed_hosts, scripts_));
   return true;
 }
 
 std::unique_ptr<ScriptInjection> UserScriptSet::GetDeclarativeScriptInjection(
     int script_id,
     content::RenderFrame* render_frame,
     int tab_id,
     UserScript::RunLocation run_location,
     const GURL& document_url,
     bool log_activity) {
-  for (const std::unique_ptr<UserScript>& script : scripts_) {
+  for (const std::unique_ptr<RendererUserScript>& script : scripts_) {
     if (script->id() == script_id) {
       return GetInjectionForScript(script.get(), render_frame, tab_id,
                                    run_location, document_url,
                                    true /* is_declarative */, log_activity);
     }
   }
   return std::unique_ptr<ScriptInjection>();
 }
 
 std::unique_ptr<ScriptInjection> UserScriptSet::GetInjectionForScript(
-    const UserScript* script,
+    const RendererUserScript* script,
     content::RenderFrame* render_frame,
     int tab_id,
     UserScript::RunLocation run_location,
     const GURL& document_url,
     bool is_declarative,
     bool log_activity) {
   std::unique_ptr<ScriptInjection> injection;
   std::unique_ptr<const InjectionHost> injection_host;
   blink::WebLocalFrame* web_frame = render_frame->GetWebFrame();
 
@@ skipping 33 matching lines @@
       !script->js_scripts().empty() && script->run_location() == run_location;
   if (inject_css || inject_js) {
     injection.reset(new ScriptInjection(std::move(injector), render_frame,
                                         std::move(injection_host), run_location,
                                         log_activity));
   }
   return injection;
 }
 
 }  // namespace extensions