Encrypted Media: Confine UUID code to MediaDrmBridge.

content/renderer/media/android/renderer_media_player_manager.cc

 // Copyright 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 "content/renderer/media/android/renderer_media_player_manager.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "content/common/media/cdm_messages.h"
 #include "content/common/media/media_player_messages_android.h"
 #include "content/renderer/media/android/proxy_media_keys.h"
 #include "content/renderer/media/android/renderer_media_player_manager.h"
 #include "content/renderer/media/android/webmediaplayer_android.h"
 #include "ui/gfx/rect_f.h"
 
-// Maximum sizes for various EME message parameters. These are checks to
-// prevent unnecessarily large messages from being passed around, and the sizes
-// are somewhat arbitrary as the EME specification doesn't specify any limits.
-static const size_t kEmeWebSessionIdMaximum = 512;
-static const size_t kEmeMessageMaximum = 10240;  // 10 KB
+namespace content {
 
-namespace content {
+// Maximum sizes for various EME API parameters. These are checks to prevent
+// unnecessarily large messages from being passed around, and the sizes
+// are somewhat arbitrary as the EME spec doesn't specify any limits.
+const size_t kMaxWebSessionIdLength = 512;
+const size_t kMaxSessionMessageLength = 10240;  // 10 KB
 
 RendererMediaPlayerManager::RendererMediaPlayerManager(RenderView* render_view)
     : RenderViewObserver(render_view),
       next_media_player_id_(0),
       fullscreen_frame_(NULL),
       pending_fullscreen_frame_(NULL) {}
 
 RendererMediaPlayerManager::~RendererMediaPlayerManager() {
   std::map<int, WebMediaPlayerAndroid*>::iterator player_it;
   for (player_it = media_players_.begin();
@@ skipping 201 matching lines @@
   Send(new MediaPlayerHostMsg_EnterFullscreen(routing_id(), player_id));
 }
 
 void RendererMediaPlayerManager::ExitFullscreen(int player_id) {
   pending_fullscreen_frame_ = NULL;
   Send(new MediaPlayerHostMsg_ExitFullscreen(routing_id(), player_id));
 }
 
 void RendererMediaPlayerManager::InitializeCdm(int cdm_id,
                                                ProxyMediaKeys* media_keys,
-                                               const std::vector<uint8>& uuid,
+                                               const std::string& key_system,
                                                const GURL& frame_url) {
   RegisterMediaKeys(cdm_id, media_keys);
-  Send(new CdmHostMsg_InitializeCdm(routing_id(), cdm_id, uuid, frame_url));
+  Send(new CdmHostMsg_InitializeCdm(
+      routing_id(), cdm_id, key_system, frame_url));
 }
 
 void RendererMediaPlayerManager::CreateSession(
     int cdm_id,
     uint32 session_id,
     CdmHostMsg_CreateSession_ContentType content_type,
     const std::vector<uint8>& init_data) {
   Send(new CdmHostMsg_CreateSession(
       routing_id(), cdm_id, session_id, content_type, init_data));
 }
@@ skipping 11 matching lines @@
 }
 
 void RendererMediaPlayerManager::DestroyCdm(int cdm_id) {
   Send(new CdmHostMsg_DestroyCdm(routing_id(), cdm_id));
 }
 
 void RendererMediaPlayerManager::OnSessionCreated(
     int cdm_id,
     uint32 session_id,
     const std::string& web_session_id) {
-  if (web_session_id.length() > kEmeWebSessionIdMaximum) {
+  if (web_session_id.length() > kMaxWebSessionIdLength) {
     OnSessionError(cdm_id, session_id, media::MediaKeys::kUnknownError, 0);
     return;
   }
 
   ProxyMediaKeys* media_keys = GetMediaKeys(cdm_id);
   if (media_keys)
     media_keys->OnSessionCreated(session_id, web_session_id);
 }
 
 void RendererMediaPlayerManager::OnSessionMessage(
     int cdm_id,
     uint32 session_id,
     const std::vector<uint8>& message,
     const GURL& destination_url) {
-  if (message.size() > kEmeMessageMaximum) {
+  if (message.size() > kMaxSessionMessageLength) {
     OnSessionError(cdm_id, session_id, media::MediaKeys::kUnknownError, 0);
     return;
   }
 
   ProxyMediaKeys* media_keys = GetMediaKeys(cdm_id);
   if (media_keys)
     media_keys->OnSessionMessage(session_id, message, destination_url.spec());
 }
 
 void RendererMediaPlayerManager::OnSessionReady(int cdm_id, uint32 session_id) {
@@ skipping 121 matching lines @@
 
     if (player && player->hasVideo()) {
       if (player->UpdateBoundaryRectangle())
         (*changes)[player_it->first] = player->GetBoundaryRectangle();
     }
   }
 }
 #endif  // defined(VIDEO_HOLE)
 
 }  // namespace content