Encrypted Media: Confine UUID code to MediaDrmBridge.

content/browser/media/android/media_drm_credential_manager.cc

Index: content/browser/media/android/media_drm_credential_manager.cc
diff --git a/content/browser/media/android/media_drm_credential_manager.cc b/content/browser/media/android/media_drm_credential_manager.cc
index e3e7afb8b879cdb9b46594ea486238cf96723aba..daa9ab5ea6f9f7ad9b58e5245364ee21f9a62a0f 100644
--- a/content/browser/media/android/media_drm_credential_manager.cc
+++ b/content/browser/media/android/media_drm_credential_manager.cc
@@ -14,6 +14,8 @@
 #include "media/base/android/media_drm_bridge.h"
 #include "url/gurl.h"
 
+#include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
+
 using base::android::ScopedJavaGlobalRef;
 
 namespace {
@@ -30,11 +32,6 @@ void MediaDrmCredentialManagerCallback(
 
 namespace content {
 
-// TODO(qinmin): Move the UUID definition to some common places.
-static const uint8 kWidevineUuid[16] = {
-    0xED, 0xEF, 0x8B, 0xA9, 0x79, 0xD6, 0x4A, 0xCE,
-    0xA3, 0xC8, 0x27, 0xDC, 0xD5, 0x1D, 0x21, 0xED };
-
 MediaDrmCredentialManager::MediaDrmCredentialManager() {};
 
 MediaDrmCredentialManager::~MediaDrmCredentialManager() {};
@@ -92,8 +89,8 @@ void MediaDrmCredentialManager::OnResetCredentialsCompleted(
 
 bool MediaDrmCredentialManager::ResetCredentialsInternal(
     SecurityLevel security_level) {
-  std::vector<uint8> uuid(kWidevineUuid, kWidevineUuid + 16);
-  media_drm_bridge_ = media::MediaDrmBridge::Create(0, uuid, GURL(), NULL);
+  media_drm_bridge_ =
+      media::MediaDrmBridge::Create(0, kWidevineKeySystem, GURL(), NULL);
   if (!media_drm_bridge_)
     return false;