Support LoadSession() in MediaKeys and PPP_ContentDecryptor_Private interface.

content/renderer/media/android/proxy_media_keys.cc

Index: content/renderer/media/android/proxy_media_keys.cc
diff --git a/content/renderer/media/android/proxy_media_keys.cc b/content/renderer/media/android/proxy_media_keys.cc
index ff9d0c54777048a28491d3910cedd669b501466f..8299aae80e40d4e20b49522a31a8219f000e9ad3 100644
--- a/content/renderer/media/android/proxy_media_keys.cc
+++ b/content/renderer/media/android/proxy_media_keys.cc
@@ -47,16 +47,17 @@ void ProxyMediaKeys::InitializeCDM(const std::string& key_system,
 }
 
 bool ProxyMediaKeys::CreateSession(uint32 session_id,
-                                   const std::string& type,
+                                   const std::string& content_type,
                                    const uint8* init_data,
                                    int init_data_length) {
   MediaKeysHostMsg_CreateSession_Type session_type;
-  if (type == "audio/mp4" || type == "video/mp4") {
+  if (content_type == "audio/mp4" || content_type == "video/mp4") {

[ddorwin, 2014/02/10 19:05:25]

This should be checked elsewhere, which means we could DCHECK at line 59. Why
don't we have this in other implementations?

(See related comments in media_keys.h.)

[xhwang, 2014/02/10 22:30:55]

Added TODO.

     session_type = CREATE_SESSION_TYPE_MP4;
-  } else if (type == "audio/webm" || type == "video/webm") {
+  } else if (content_type == "audio/webm" || content_type == "video/webm") {
     session_type = CREATE_SESSION_TYPE_WEBM;
   } else {
-    DLOG(ERROR) << "Unsupported EME CreateSession type of " << type;
+    DLOG(ERROR) << "Unsupported EME CreateSession content type of "
+                << content_type;
     OnSessionError(session_id, media::MediaKeys::kUnknownError, 0);

[ddorwin, 2014/02/10 19:05:25]

I don't think we should be throwing this error.

[xhwang, 2014/02/10 22:30:55]

Done.

     return false;
   }
@@ -69,6 +70,13 @@ bool ProxyMediaKeys::CreateSession(uint32 session_id,
   return true;
 }
 
+bool ProxyMediaKeys::LoadSession(uint32 session_id,
+                                 const std::string& web_session_id) {
+  DLOG(ERROR) << "ProxyMediaKeys doesn't support session loading.";
+  OnSessionError(session_id, media::MediaKeys::kUnknownError, 0);
+  return false;
+}
+
 void ProxyMediaKeys::UpdateSession(uint32 session_id,
                                    const uint8* response,
                                    int response_length) {