Pass media session id over IPC

content/renderer/media/android/webmediasession_android.cc

Index: content/renderer/media/android/webmediasession_android.cc
diff --git a/content/renderer/media/android/webmediasession_android.cc b/content/renderer/media/android/webmediasession_android.cc
index ddfa13c73e904900907cbee38b13a356f4f0db63..7c50f523360c3f13e25e95e01cac1399ff7f3388 100644
--- a/content/renderer/media/android/webmediasession_android.cc
+++ b/content/renderer/media/android/webmediasession_android.cc
@@ -16,21 +16,21 @@ WebMediaSessionAndroid::WebMediaSessionAndroid(
     RendererMediaSessionManager* session_manager)
     : session_manager_(session_manager) {
   DCHECK(session_manager_);
-  session_id_ = session_manager_->RegisterMediaSession(this);
+  media_session_id_ = session_manager_->RegisterMediaSession(this);
 }
 
 WebMediaSessionAndroid::~WebMediaSessionAndroid() {
-  session_manager_->UnregisterMediaSession(session_id_);
+  session_manager_->UnregisterMediaSession(media_session_id_);
 }
 
 void WebMediaSessionAndroid::activate(
     blink::WebMediaSessionActivateCallback* callback) {
-  session_manager_->Activate(session_id_, make_scoped_ptr(callback));
+  session_manager_->Activate(media_session_id_, make_scoped_ptr(callback));
 }
 
 void WebMediaSessionAndroid::deactivate(
     blink::WebMediaSessionDeactivateCallback* callback) {
-  session_manager_->Deactivate(session_id_, make_scoped_ptr(callback));
+  session_manager_->Deactivate(media_session_id_, make_scoped_ptr(callback));
 }
 
 void WebMediaSessionAndroid::setMetadata(
@@ -42,7 +42,7 @@ void WebMediaSessionAndroid::setMetadata(
     metadata.album = web_metadata->album;
   }
 
-  session_manager_->SetMetadata(session_id_, metadata);
+  session_manager_->SetMetadata(media_session_id_, metadata);
 }
 
 }  // namespace content