Remove ScopedVector from content/browser/ [1].

content/browser/media/android/browser_media_player_manager.h

 // Copyright 2013 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 CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_
 #define CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_
 
 #include <map>
 #include <memory>
+#include <vector>
 
 #include "base/callback.h"
 #include "base/macros.h"
-#include "base/memory/scoped_vector.h"
 #include "base/time/time.h"
 #include "content/browser/android/content_video_view.h"
 #include "content/common/content_export.h"
 #include "ipc/ipc_message.h"
 #include "media/base/android/media_player_android.h"
 #include "media/base/android/media_player_manager.h"
 #include "media/base/android/media_url_interceptor.h"
 #include "ui/gfx/geometry/rect_f.h"
 #include "ui/gl/android/scoped_java_surface.h"
 #include "url/gurl.h"
@@ skipping 83 matching lines @@
   virtual void ReleaseFullscreenPlayer(media::MediaPlayerAndroid* player);
 
  protected:
   // Clients must use Create() or subclass constructor.
   explicit BrowserMediaPlayerManager(RenderFrameHost* render_frame_host);
 
   WebContents* web_contents() const { return web_contents_; }
 
   // Adds a given player to the list.  Not private to allow embedders
   // to extend the manager and still utilize the base player management.
-  void AddPlayer(media::MediaPlayerAndroid* player, int delegate_id);
+  void AddPlayer(std::unique_ptr<media::MediaPlayerAndroid> player,
+                 int delegate_id);
 
   // Removes the player with the specified id.
   void DestroyPlayer(int player_id);
 
   // Release resources associated to a player.
   virtual void ReleaseResources(int player_id);
 
   // Replaces a player with the specified id with a given MediaPlayerAndroid
   // object. This will also return the original MediaPlayerAndroid object that
   // was replaced.
@@ skipping 16 matching lines @@
   // is stuck in an error.
   virtual void OnDecoderResourcesReleased(int player_id);
 
   int RoutingID();
 
   // Helper function to send messages to RenderFrameObserver.
   bool Send(IPC::Message* msg);
 
  private:
   // Constructs a MediaPlayerAndroid object.
-  media::MediaPlayerAndroid* CreateMediaPlayer(
+  std::unique_ptr<media::MediaPlayerAndroid> CreateMediaPlayer(
       const MediaPlayerHostMsg_Initialize_Params& media_player_params,
       bool hide_url_log);
 
   // Instructs |player| to release its java player. This will not remove the
   // player from |players_|.
   void ReleasePlayer(media::MediaPlayerAndroid* player);
 
   // Called when user approves media playback after being throttled.
   void OnPlaybackPermissionGranted(int player_id, bool granted);
 
   // Helper method to start playback.
   void StartInternal(int player_id);
 
   RenderFrameHost* const render_frame_host_;
 
   // An array of managed players.
-  ScopedVector<media::MediaPlayerAndroid> players_;
+  std::vector<std::unique_ptr<media::MediaPlayerAndroid>> players_;
 
   typedef std::map<int, bool> ActivePlayerMap;
   // Players that have requested decoding resources. Even though resource is
   // requested, a player may be in a paused or error state and the manager
   // will release its resources later.
   ActivePlayerMap active_players_;
 
   // The fullscreen video view object or NULL if video is not played in
   // fullscreen.
   std::unique_ptr<ContentVideoView> video_view_;
@@ skipping 15 matching lines @@
 
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<BrowserMediaPlayerManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserMediaPlayerManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_