Encrypted Media: Confine UUID code to MediaDrmBridge.

chrome/renderer/media/chrome_key_systems.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 "chrome/renderer/media/chrome_key_systems.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/strings/string16.h"
@@ skipping 130 matching lines @@
 
 #if defined(OS_ANDROID)
 #define COMPILE_ASSERT_MATCHING_ENUM(name) \
   COMPILE_ASSERT(static_cast<int>(name) == \
                  static_cast<int>(android::name), \
                  mismatching_enums)
 COMPILE_ASSERT_MATCHING_ENUM(WEBM_VP8_AND_VORBIS);
 COMPILE_ASSERT_MATCHING_ENUM(MP4_AAC);
 COMPILE_ASSERT_MATCHING_ENUM(MP4_AVC1);
 #undef COMPILE_ASSERT_MATCHING_ENUM
-
-static const uint8 kWidevineUuid[16] = {
-    0xED, 0xEF, 0x8B, 0xA9, 0x79, 0xD6, 0x4A, 0xCE,
-    0xA3, 0xC8, 0x27, 0xDC, 0xD5, 0x1D, 0x21, 0xED };
 #else
 static bool IsWidevineHrSupported() {
   // TODO(jrummell): Need to call CheckPlatformState() but it is
   // asynchronous, and needs to be done in the browser.
   return false;
 }
 #endif
 
 // Return |name|'s parent key system.
 static std::string GetDirectParentName(std::string name) {
@@ skipping 41 matching lines @@
                                "";
     const char* audio_codecs = is_aac_supported ? kMp4a : "";
 
     info.supported_types.push_back(std::make_pair(kAudioMp4, audio_codecs));
     info.supported_types.push_back(std::make_pair(kVideoMp4, video_codecs));
   }
 #endif  // defined(USE_PROPRIETARY_CODECS)
 
 #if defined(ENABLE_PEPPER_CDMS)
   info.pepper_type = kWidevineCdmPluginMimeType;
-#elif defined(OS_ANDROID)
-  info.uuid.assign(kWidevineUuid, kWidevineUuid + arraysize(kWidevineUuid));
 #endif  // defined(ENABLE_PEPPER_CDMS)
 
   concrete_key_systems->push_back(info);
 }
 
 #if defined(ENABLE_PEPPER_CDMS)
 // When the adapter is registered, a name-value pair is inserted in
 // additional_param_* that lists the supported codecs. The name is "codecs" and
 // the value is a comma-delimited list of codecs.
 // This function finds "codecs" and parses the value into the vector |codecs|.
@@ skipping 62 matching lines @@
 
   if (IsWidevineHrSupported())
     AddWidevineWithCodecs(WIDEVINE_HR, supported_codecs, concrete_key_systems);
 }
 #elif defined(OS_ANDROID)
 static void AddAndroidWidevine(
     std::vector<KeySystemInfo>* concrete_key_systems) {
   SupportedKeySystemRequest request;
   SupportedKeySystemResponse response;
 
-  request.uuid.insert(request.uuid.begin(), kWidevineUuid,
-                      kWidevineUuid + arraysize(kWidevineUuid));
+  request.key_system = kWidevineKeySystem;
 #if defined(USE_PROPRIETARY_CODECS)
   request.codecs = static_cast<android::SupportedCodecs>(
       android::MP4_AAC | android::MP4_AVC1);
 #endif  // defined(USE_PROPRIETARY_CODECS)
   content::RenderThread::Get()->Send(
       new ChromeViewHostMsg_GetSupportedKeySystems(request, &response));
   DCHECK_EQ(response.compositing_codecs >> 3, 0) << "unrecognized codec";
   DCHECK_EQ(response.non_compositing_codecs >> 3, 0) << "unrecognized codec";
   if (response.compositing_codecs != android::NO_SUPPORTED_CODECS) {
     AddWidevineWithCodecs(
@@ skipping 18 matching lines @@
 #endif
 
 #if defined(WIDEVINE_CDM_AVAILABLE)
 #if defined(ENABLE_PEPPER_CDMS)
   AddPepperBasedWidevine(key_systems_info);
 #elif defined(OS_ANDROID)
   AddAndroidWidevine(key_systems_info);
 #endif
 #endif
 }