[UserScript cleanup] Remove use of ScopedVector from UserScriptSet.

extensions/renderer/user_script_set.h

 // 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.
 
 #ifndef EXTENSIONS_RENDERER_USER_SCRIPT_SET_H_
 #define EXTENSIONS_RENDERER_USER_SCRIPT_SET_H_
 
 #include <memory>
 #include <set>
 #include <string>
@@ skipping 16 matching lines @@
 
 // The UserScriptSet is a collection of UserScripts which knows how to update
 // itself from SharedMemory and create ScriptInjections for UserScripts to
 // inject on a page.
 class UserScriptSet {
  public:
   class Observer {
    public:
     virtual void OnUserScriptsUpdated(
         const std::set<HostID>& changed_hosts,
-        const std::vector<UserScript*>& scripts) = 0;
+        const std::vector<std::unique_ptr<UserScript>>& scripts) = 0;
   };
 
   UserScriptSet();
   ~UserScriptSet();
 
   // Adds or removes observers.
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
   // Appends the ids of the extensions that have user scripts to |ids|.
@@ skipping 16 matching lines @@
       UserScript::RunLocation run_location,
       const GURL& document_url,
       bool log_activity);
 
   // Updates scripts given the shared memory region containing user scripts.
   // Returns true if the scripts were successfully updated.
   bool UpdateUserScripts(base::SharedMemoryHandle shared_memory,
                          const std::set<HostID>& changed_hosts,
                          bool whitelisted_only);
 
-  const std::vector<UserScript*>& scripts() const { return scripts_.get(); }
+  const std::vector<std::unique_ptr<UserScript>>& scripts() const {
+    return scripts_;
+  }
 
  private:
   // Returns a new ScriptInjection for the given |script| to execute in the
   // |render_frame|, or NULL if the script should not execute.
   std::unique_ptr<ScriptInjection> GetInjectionForScript(
       const UserScript* script,
       content::RenderFrame* render_frame,
       int tab_id,
       UserScript::RunLocation run_location,
       const GURL& document_url,
       bool is_declarative,
       bool log_activity);
 
   // Shared memory containing raw script data.
   std::unique_ptr<base::SharedMemory> shared_memory_;
 
   // The UserScripts this injector manages.
-  ScopedVector<UserScript> scripts_;
+  std::vector<std::unique_ptr<UserScript>> scripts_;
 
   // The associated observers.
   base::ObserverList<Observer> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(UserScriptSet);
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_RENDERER_USER_SCRIPT_SET_H_