Encrypted Media: Confine UUID code to MediaDrmBridge.

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 5510950d2dcdce25dc1814abad287d8e79be58d9..9734e815e785ab7963e77947edfa159ec00d8c89 100644
--- a/content/renderer/media/android/proxy_media_keys.cc
+++ b/content/renderer/media/android/proxy_media_keys.cc
@@ -37,13 +37,7 @@ ProxyMediaKeys::~ProxyMediaKeys() {
 
 void ProxyMediaKeys::InitializeCdm(const std::string& key_system,
                                    const GURL& frame_url) {
-#if defined(ENABLE_PEPPER_CDMS)
-  NOTIMPLEMENTED();
-#elif defined(OS_ANDROID)
-  std::vector<uint8> uuid = GetUUID(key_system);
-  DCHECK(!uuid.empty());
-  manager_->InitializeCdm(cdm_id_, this, uuid, frame_url);
-#endif
+  manager_->InitializeCdm(cdm_id_, this, key_system, frame_url);
 }
 
 bool ProxyMediaKeys::CreateSession(uint32 session_id,