Propagate media session id into MediaPlayerAndroid

media/base/android/media_player_android.cc

 // Copyright (c) 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 "media/base/android/media_player_android.h"
 
 #include <algorithm>
 
 #include "base/android/context_utils.h"
 #include "base/logging.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "media/base/android/media_drm_bridge.h"
 #include "media/base/android/media_player_manager.h"
 
 namespace {
 
 const double kDefaultVolume = 1.0;
 
 }  // namespace
 
 namespace media {
 
 const double MediaPlayerAndroid::kDefaultVolumeMultiplier = 1.0;
 
 MediaPlayerAndroid::MediaPlayerAndroid(
     int player_id,
     MediaPlayerManager* manager,
     const OnDecoderResourcesReleasedCB& on_decoder_resources_released_cb,
-    const GURL& frame_url)
+    const GURL& frame_url,
+    int media_session_id)
     : on_decoder_resources_released_cb_(on_decoder_resources_released_cb),
       player_id_(player_id),
       volume_(kDefaultVolume),
       volume_multiplier_(kDefaultVolumeMultiplier),
       manager_(manager),
       frame_url_(frame_url),
+      media_session_id_(media_session_id),
       weak_factory_(this) {
   listener_.reset(new MediaPlayerListener(base::ThreadTaskRunnerHandle::Get(),
                                           weak_factory_.GetWeakPtr()));
 }
 
 MediaPlayerAndroid::~MediaPlayerAndroid() {}
 
 void MediaPlayerAndroid::SetVolume(double volume) {
   volume_ = std::max(0.0, std::min(volume, 1.0));
   UpdateEffectiveVolume();
@@ skipping 71 matching lines @@
 void MediaPlayerAndroid::DestroyListenerOnUIThread() {
   weak_factory_.InvalidateWeakPtrs();
   listener_.reset();
 }
 
 base::WeakPtr<MediaPlayerAndroid> MediaPlayerAndroid::WeakPtrForUIThread() {
   return weak_factory_.GetWeakPtr();
 }
 
 }  // namespace media