[UserScript cleanup] Remove use of ScopedVector from UserScriptSet.

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 UserScript* script : scripts_) {
+  for (const std::unique_ptr<UserScript>& 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 UserScript* script : scripts_) {
+  for (const std::unique_ptr<UserScript>& script : scripts_) {
     std::unique_ptr<ScriptInjection> injection = GetInjectionForScript(
-        script, render_frame, tab_id, run_location, document_url,
+        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,
                                       bool whitelisted_only) {
   bool only_inject_incognito =
@@ skipping 54 matching lines @@
         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_.get()));
+  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 UserScript* script : scripts_) {
+  for (const std::unique_ptr<UserScript>& script : scripts_) {
     if (script->id() == script_id) {
-      return GetInjectionForScript(script, render_frame, tab_id, run_location,
-                                   document_url, true /* is_declarative */,
-                                   log_activity);
+      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,
     content::RenderFrame* render_frame,
     int tab_id,
     UserScript::RunLocation run_location,
@@ skipping 40 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