| Index: media/base/android/media_player_bridge.cc
|
| diff --git a/media/base/android/media_player_bridge.cc b/media/base/android/media_player_bridge.cc
|
| index deaba14bcb63e361460f79bc24634a2d085757da..f0738ba07e220512b2df2fd306653f5acc0d0380 100644
|
| --- a/media/base/android/media_player_bridge.cc
|
| +++ b/media/base/android/media_player_bridge.cc
|
| @@ -32,11 +32,13 @@ MediaPlayerBridge::MediaPlayerBridge(
|
| MediaPlayerManager* manager,
|
| const OnDecoderResourcesReleasedCB& on_decoder_resources_released_cb,
|
| const GURL& frame_url,
|
| - bool allow_credentials)
|
| + bool allow_credentials,
|
| + int session_id)
|
| : MediaPlayerAndroid(player_id,
|
| manager,
|
| on_decoder_resources_released_cb,
|
| - frame_url),
|
| + frame_url,
|
| + session_id),
|
| prepared_(false),
|
| pending_play_(false),
|
| should_seek_on_prepare_(false),
|
| @@ -51,8 +53,7 @@ MediaPlayerBridge::MediaPlayerBridge(
|
| can_seek_backward_(true),
|
| volume_(-1.0),
|
| allow_credentials_(allow_credentials),
|
| - weak_factory_(this) {
|
| -}
|
| + weak_factory_(this) {}
|
|
|
| MediaPlayerBridge::~MediaPlayerBridge() {
|
| if (!j_media_player_bridge_.is_null()) {
|
|
|