Rename EME WD call parameters

content/browser/media/android/browser_media_player_manager.cc

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 2273b5cdc23e4ad81c7bcd4393ebe896a3d8d5e0..89e6226b719ba5a6f4e7ebfa20b7af716d87d951 100644
--- a/content/browser/media/android/browser_media_player_manager.cc
+++ b/content/browser/media/android/browser_media_player_manager.cc
@@ -367,38 +367,38 @@ void BrowserMediaPlayerManager::OnProtectedSurfaceRequested(int player_id) {
 
 void BrowserMediaPlayerManager::OnSessionCreated(
     int media_keys_id,
-    uint32 reference_id,
-    const std::string& session_id) {
+    uint32 session_id,
+    const std::string& web_session_id) {
   Send(new MediaKeysMsg_SetSessionId(
-      routing_id(), media_keys_id, reference_id, session_id));
+      routing_id(), media_keys_id, session_id, web_session_id));
 }
 
 void BrowserMediaPlayerManager::OnSessionMessage(
     int media_keys_id,
-    uint32 reference_id,
+    uint32 session_id,
     const std::vector<uint8>& message,
     const std::string& destination_url) {
   Send(new MediaKeysMsg_KeyMessage(
-      routing_id(), media_keys_id, reference_id, message, destination_url));
+      routing_id(), media_keys_id, session_id, message, destination_url));
 }
 
 void BrowserMediaPlayerManager::OnSessionReady(int media_keys_id,
-                                               uint32 reference_id) {
-  Send(new MediaKeysMsg_KeyAdded(routing_id(), media_keys_id, reference_id));
+                                               uint32 session_id) {
+  Send(new MediaKeysMsg_KeyAdded(routing_id(), media_keys_id, session_id));
 }
 
 void BrowserMediaPlayerManager::OnSessionClosed(int media_keys_id,
-                                                uint32 reference_id) {
+                                                uint32 session_id) {
   // TODO(jrummell): Update Android calls and IPC names.
 }
 
 void BrowserMediaPlayerManager::OnSessionError(
     int media_keys_id,
-    uint32 reference_id,
+    uint32 session_id,
     media::MediaKeys::KeyError error_code,
     int system_code) {
-  Send(new MediaKeysMsg_KeyError(routing_id(), media_keys_id,
-                                 reference_id, error_code, system_code));
+  Send(new MediaKeysMsg_KeyError(
+      routing_id(), media_keys_id, session_id, error_code, system_code));

[ddorwin, 2013/12/05 00:44:52]

This doesn't seem like the right formatting.

[jrummell, 2013/12/06 23:42:35]

It's what clang-format does with it.

 }
 
 #if defined(GOOGLE_TV)
@@ -554,12 +554,12 @@ void BrowserMediaPlayerManager::OnInitializeCDM(
 
 void BrowserMediaPlayerManager::OnGenerateKeyRequest(
     int media_keys_id,
-    uint32 reference_id,
+    uint32 session_id,
     const std::string& type,
     const std::vector<uint8>& init_data) {
   if (CommandLine::ForCurrentProcess()
       ->HasSwitch(switches::kDisableInfobarForProtectedMediaIdentifier)) {
-    GenerateKeyIfAllowed(media_keys_id, reference_id, type, init_data, true);
+    GenerateKeyIfAllowed(media_keys_id, session_id, type, init_data, true);
     return;
   }
 
@@ -567,7 +567,7 @@ void BrowserMediaPlayerManager::OnGenerateKeyRequest(
   if (!drm_bridge) {
     DLOG(WARNING) << "No MediaDrmBridge for ID: " << media_keys_id << " found";
     OnSessionError(
-        media_keys_id, reference_id, media::MediaKeys::kUnknownError, 0);
+        media_keys_id, session_id, media::MediaKeys::kUnknownError, 0);
     return;
   }
 
@@ -581,25 +581,25 @@ void BrowserMediaPlayerManager::OnGenerateKeyRequest(
       base::Bind(&BrowserMediaPlayerManager::GenerateKeyIfAllowed,
                  weak_ptr_factory_.GetWeakPtr(),
                  media_keys_id,
-                 reference_id,
+                 session_id,
                  type,
                  init_data));
 }
 
 void BrowserMediaPlayerManager::OnAddKey(int media_keys_id,
-                                         uint32 reference_id,
+                                         uint32 session_id,
                                          const std::vector<uint8>& key,
                                          const std::vector<uint8>& init_data) {
   MediaDrmBridge* drm_bridge = GetDrmBridge(media_keys_id);
   if (!drm_bridge) {
     DLOG(WARNING) << "No MediaDrmBridge for ID: " << media_keys_id << " found";
     OnSessionError(
-        media_keys_id, reference_id, media::MediaKeys::kUnknownError, 0);
+        media_keys_id, session_id, media::MediaKeys::kUnknownError, 0);
     return;
   }
 
   DCHECK(init_data.empty());
-  drm_bridge->UpdateSession(reference_id, &key[0], key.size());
+  drm_bridge->UpdateSession(session_id, &key[0], key.size());
   // In EME v0.1b MediaKeys lives in the media element. So the |media_keys_id|
   // is the same as the |player_id|.
   // TODO(xhwang): Separate |media_keys_id| and |player_id|.
@@ -608,18 +608,17 @@ void BrowserMediaPlayerManager::OnAddKey(int media_keys_id,
     player->OnKeyAdded();
 }
 
-void BrowserMediaPlayerManager::OnCancelKeyRequest(
-    int media_keys_id,
-    uint32 reference_id) {
+void BrowserMediaPlayerManager::OnCancelKeyRequest(int media_keys_id,
+                                                   uint32 session_id) {
   MediaDrmBridge* drm_bridge = GetDrmBridge(media_keys_id);
   if (!drm_bridge) {
     DLOG(WARNING) << "No MediaDrmBridge for ID: " << media_keys_id << " found";
     OnSessionError(
-        media_keys_id, reference_id, media::MediaKeys::kUnknownError, 0);
+        media_keys_id, session_id, media::MediaKeys::kUnknownError, 0);
     return;
   }
 
-  drm_bridge->ReleaseSession(reference_id);
+  drm_bridge->ReleaseSession(session_id);
 }
 
 void BrowserMediaPlayerManager::AddPlayer(MediaPlayerAndroid* player) {
@@ -716,7 +715,7 @@ void BrowserMediaPlayerManager::OnSetMediaKeys(int player_id,
 
 void BrowserMediaPlayerManager::GenerateKeyIfAllowed(
     int media_keys_id,
-    uint32 reference_id,
+    uint32 session_id,
     const std::string& type,
     const std::vector<uint8>& init_data,
     bool allowed) {
@@ -727,13 +726,12 @@ void BrowserMediaPlayerManager::GenerateKeyIfAllowed(
   if (!drm_bridge) {
     DLOG(WARNING) << "No MediaDrmBridge for ID: " << media_keys_id << " found";
     OnSessionError(
-        media_keys_id, reference_id, media::MediaKeys::kUnknownError, 0);
+        media_keys_id, session_id, media::MediaKeys::kUnknownError, 0);
     return;
   }
   media_keys_ids_pending_approval_.erase(media_keys_id);
   media_keys_ids_approved_.insert(media_keys_id);
-  drm_bridge->CreateSession(
-      reference_id, type, &init_data[0], init_data.size());
+  drm_bridge->CreateSession(session_id, type, &init_data[0], init_data.size());
 
   // TODO(qinmin): currently |media_keys_id| and player ID are identical.
   // This might not be true in the future.