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

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

Issue 2767893002: Remove ScopedVector from chrome/browser/. (Closed)
Patch Set: Address comments from zea@ 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/browser/media/android/browser_media_player_manager.h ('k') | no next file » | 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 c89082081244c5fc66e566820e7e4afe6bf07be7..36ae2e555651ef8f23c952696554f954ef47f4c4 100644
--- a/content/browser/media/android/browser_media_player_manager.cc
+++ b/content/browser/media/android/browser_media_player_manager.cc
@@ -466,7 +466,7 @@ void BrowserMediaPlayerManager::ReleaseResources(int player_id) {
std::unique_ptr<MediaPlayerAndroid> BrowserMediaPlayerManager::SwapPlayer(
int player_id,
- MediaPlayerAndroid* player) {
+ std::unique_ptr<MediaPlayerAndroid> player) {
std::unique_ptr<MediaPlayerAndroid> previous_player;
for (auto it = players_.begin(); it != players_.end(); ++it) {
if ((*it)->player_id() == player_id) {
@@ -475,7 +475,7 @@ std::unique_ptr<MediaPlayerAndroid> BrowserMediaPlayerManager::SwapPlayer(
->DisconnectMediaSession(render_frame_host_,
player_id_to_delegate_id_map_[player_id]);
players_.erase(it);
- players_.push_back(base::WrapUnique(player));
+ players_.push_back(std::move(player));
break;
}
}
« no previous file with comments | « content/browser/media/android/browser_media_player_manager.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698