Encrypted Media: Confine UUID code to MediaDrmBridge.

content/renderer/media/android/proxy_media_keys.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/proxy_media_keys.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
@@ skipping 19 matching lines @@
       session_error_cb_(session_error_cb) {
   DCHECK(manager_);
 }
 
 ProxyMediaKeys::~ProxyMediaKeys() {
   manager_->DestroyCdm(cdm_id_);
 }
 
 void ProxyMediaKeys::InitializeCdm(const std::string& key_system,
                                    const GURL& frame_url) {
 #if defined(ENABLE_PEPPER_CDMS)

[ddorwin, 2014/03/04 20:00:56]

Do we need any of these ifdefs? This is only Android, right?

[xhwang, 2014/03/05 21:52:33]

Done.

   NOTIMPLEMENTED();
 #elif defined(OS_ANDROID)
-  std::vector<uint8> uuid = GetUUID(key_system);
-  DCHECK(!uuid.empty());
-  manager_->InitializeCdm(cdm_id_, this, uuid, frame_url);
+  manager_->InitializeCdm(cdm_id_, this, key_system, frame_url);
 #endif
 }
 
 bool ProxyMediaKeys::CreateSession(uint32 session_id,
                                    const std::string& content_type,
                                    const uint8* init_data,
                                    int init_data_length) {
   // TODO(xhwang): Move these checks up to blink and DCHECK here.
   // See http://crbug.com/342510
   CdmHostMsg_CreateSession_ContentType session_type;
@@ skipping 55 matching lines @@
   session_closed_cb_.Run(session_id);
 }
 
 void ProxyMediaKeys::OnSessionError(uint32 session_id,
                                     media::MediaKeys::KeyError error_code,
                                     uint32 system_code) {
   session_error_cb_.Run(session_id, error_code, system_code);
 }
 
 }  // namespace content