Remove ScopedVector from content/.

content/browser/media/android/browser_media_player_manager.cc

 // 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.
 
 #include "content/browser/media/android/browser_media_player_manager.h"
 
 #include <utility>
 
 #include "base/android/scoped_java_ref.h"
 #include "base/memory/ptr_util.h"
@@ skipping 70 matching lines @@
 #endif
 
 std::unique_ptr<MediaPlayerAndroid>
 BrowserMediaPlayerManager::CreateMediaPlayer(
     const MediaPlayerHostMsg_Initialize_Params& media_player_params,
     bool hide_url_log) {
   switch (media_player_params.type) {
     case MEDIA_PLAYER_TYPE_REMOTE_ONLY:
     case MEDIA_PLAYER_TYPE_URL: {
       const std::string user_agent = GetContentClient()->GetUserAgent();
-      std::unique_ptr<MediaPlayerAndroid> media_player_bridge(
-          new MediaPlayerBridge(
-              media_player_params.player_id, media_player_params.url,
-              media_player_params.first_party_for_cookies, user_agent,
-              hide_url_log, this,
-              base::Bind(&BrowserMediaPlayerManager::OnDecoderResourcesReleased,
-                         weak_ptr_factory_.GetWeakPtr()),
-              media_player_params.frame_url,
-              media_player_params.allow_credentials));
+      auto media_player_bridge = base::MakeUnique<MediaPlayerBridge>(

[danakj, 2017/03/15 15:20:24]

LGTM :)

+          media_player_params.player_id, media_player_params.url,
+          media_player_params.first_party_for_cookies, user_agent, hide_url_log,
+          this,
+          base::Bind(&BrowserMediaPlayerManager::OnDecoderResourcesReleased,
+                     weak_ptr_factory_.GetWeakPtr()),
+          media_player_params.frame_url, media_player_params.allow_credentials);
 
       if (media_player_params.type == MEDIA_PLAYER_TYPE_REMOTE_ONLY)
-        return media_player_bridge;
+        return std::move(media_player_bridge);
 
       bool should_block = false;
       bool extract_metadata =
           // Initialize the player will cause MediaMetadataExtractor to decode
           // small chunks of data.
           RequestDecoderResources(media_player_params.player_id, true);
 #if !defined(USE_AURA)
       if (WebContentsDelegate* delegate = web_contents_->GetDelegate()) {
         should_block =
             delegate->ShouldBlockMediaRequest(media_player_params.url);
       } else {
         extract_metadata = false;
       }
 #endif
       if (!extract_metadata) {
         // May reach here due to prerendering or throttling. Don't extract the
         // metadata since it is expensive.
         // TODO(qinmin): extract the metadata once the user decided to load
         // the page.
         OnMediaMetadataChanged(media_player_params.player_id, base::TimeDelta(),
                                0, 0, false);
       } else if (!should_block) {
-        static_cast<MediaPlayerBridge*>(media_player_bridge.get())
-            ->Initialize();
+        media_player_bridge->Initialize();
       }
-      return media_player_bridge;
+      return std::move(media_player_bridge);
     }
   }
 
   NOTREACHED();
   return nullptr;
 }
 
 BrowserMediaPlayerManager::BrowserMediaPlayerManager(
     RenderFrameHost* render_frame_host)
     : render_frame_host_(render_frame_host),
@@ skipping 423 matching lines @@
   if (!player)
     return;
   player->Start();
   if (fullscreen_player_id_ == player_id && fullscreen_player_is_released_) {
     video_view_->OpenVideo();
     fullscreen_player_is_released_ = false;
   }
 }
 
 }  // namespace content