Remove ScopedVector from chrome/browser/.

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>
@@ skipping 110 matching lines @@
   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.
   std::unique_ptr<media::MediaPlayerAndroid> SwapPlayer(
       int player_id,
-      media::MediaPlayerAndroid* player);
+      std::unique_ptr<media::MediaPlayerAndroid> player);
 
   // Called to request decoder resources. Returns true if the request is
   // permitted, or false otherwise. The manager object maintains a list
   // of active MediaPlayerAndroid objects and releases the inactive resources
   // when needed. If |temporary| is true, the request is short lived
   // and it will not be cleaned up when handling other requests.
   // On the contrary, requests with false |temporary| value are subject to
   // clean up if their players are idle.
   virtual bool RequestDecoderResources(int player_id, bool temporary);
 
@@ skipping 56 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_