Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1093)

Unified Diff: content/browser/media/android/browser_media_player_manager.cc

Issue 2749203002: Remove ScopedVector from content/. (Closed)
Patch Set: Remove ScopedVector from content/. Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/app/content_main_runner.cc ('k') | content/child/blob_storage/blob_transport_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/media/android/browser_media_player_manager.cc
diff --git a/content/browser/media/android/browser_media_player_manager.cc b/content/browser/media/android/browser_media_player_manager.cc
index 1ea8bf152dcc60c5445115e8057fd529e462b437..c89082081244c5fc66e566820e7e4afe6bf07be7 100644
--- a/content/browser/media/android/browser_media_player_manager.cc
+++ b/content/browser/media/android/browser_media_player_manager.cc
@@ -88,18 +88,16 @@ BrowserMediaPlayerManager::CreateMediaPlayer(
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 =
@@ -122,10 +120,9 @@ BrowserMediaPlayerManager::CreateMediaPlayer(
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);
}
}
« no previous file with comments | « content/app/content_main_runner.cc ('k') | content/child/blob_storage/blob_transport_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698