Encrypted Media: Confine UUID code to MediaDrmBridge.

content/renderer/media/android/renderer_media_player_manager.cc

Index: content/renderer/media/android/renderer_media_player_manager.cc
diff --git a/content/renderer/media/android/renderer_media_player_manager.cc b/content/renderer/media/android/renderer_media_player_manager.cc
index f61c096546ad789fb533c3aecdc414ac0e0c0a3f..5b1ac54b0152c790b0d304d3ad434fc296275f97 100644
--- a/content/renderer/media/android/renderer_media_player_manager.cc
+++ b/content/renderer/media/android/renderer_media_player_manager.cc
@@ -13,13 +13,13 @@
 #include "content/renderer/media/android/webmediaplayer_android.h"
 #include "ui/gfx/rect_f.h"
 
+namespace content {
+
 // 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 {
+const size_t kEmeWebSessionIdMaximum = 512;
+const size_t kEmeMessageMaximum = 10240;  // 10 KB
 
 RendererMediaPlayerManager::RendererMediaPlayerManager(RenderView* render_view)
     : RenderViewObserver(render_view),
@@ -241,10 +241,11 @@ void RendererMediaPlayerManager::ExitFullscreen(int 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(