From c5238bb8f0b3bb16573a11f0d6cbba9177696fc0 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 30 Dec 2015 11:40:52 +0800
Subject: [PATCH] Update brightray and libchromiumcontent with widevine support

---
 .../renderer/media/chrome_key_systems.cc       | 18 +-----------------
 script/lib/config.py                           |  2 +-
 vendor/brightray                               |  2 +-
 3 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/chromium_src/chrome/renderer/media/chrome_key_systems.cc b/chromium_src/chrome/renderer/media/chrome_key_systems.cc
index d3c1f691a442..5d97169005b4 100644
--- a/chromium_src/chrome/renderer/media/chrome_key_systems.cc
+++ b/chromium_src/chrome/renderer/media/chrome_key_systems.cc
@@ -38,7 +38,6 @@ static bool IsPepperCdmAvailable(
     const std::string& pepper_type,
     std::vector<base::string16>* additional_param_names,
     std::vector<base::string16>* additional_param_values) {
-
   bool is_available = false;
   content::RenderThread::Get()->Send(
       new ChromeViewHostMsg_IsInternalPluginAvailableForMimeType(
@@ -81,9 +80,7 @@ void GetSupportedCodecsForPepperCdm(
 
 static void AddPepperBasedWidevine(
     std::vector<KeySystemInfo>* concrete_key_systems) {
-
 #if defined(WIDEVINE_CDM_MIN_GLIBC_VERSION)
-
   Version glibc_version(gnu_get_libc_version());
   DCHECK(glibc_version.IsValid());
   if (glibc_version.IsOlderThan(WIDEVINE_CDM_MIN_GLIBC_VERSION))
@@ -95,8 +92,7 @@ static void AddPepperBasedWidevine(
   if (!IsPepperCdmAvailable(kWidevineCdmPluginMimeType,
                             &additional_param_names,
                             &additional_param_values)) {
-    // DVLOG(1) << "Widevine CDM is not currently available.";
-
+    DVLOG(1) << "Widevine CDM is not currently available.";
     return;
   }
 
@@ -112,23 +108,18 @@ static void AddPepperBasedWidevine(
   // as those may offer a higher level of protection.
   supported_codecs |= media::EME_CODEC_WEBM_OPUS;
   supported_codecs |= media::EME_CODEC_WEBM_VORBIS;
-
 #if defined(USE_PROPRIETARY_CODECS)
   supported_codecs |= media::EME_CODEC_MP4_AAC;
-
 #endif  // defined(USE_PROPRIETARY_CODECS)
 
   for (size_t i = 0; i < codecs.size(); ++i) {
     if (codecs[i] == kCdmSupportedCodecVp8)
       supported_codecs |= media::EME_CODEC_WEBM_VP8;
-
     if (codecs[i] == kCdmSupportedCodecVp9)
       supported_codecs |= media::EME_CODEC_WEBM_VP9;
-
 #if defined(USE_PROPRIETARY_CODECS)
     if (codecs[i] == kCdmSupportedCodecAvc1)
       supported_codecs |= media::EME_CODEC_MP4_AVC1;
-
 #endif  // defined(USE_PROPRIETARY_CODECS)
   }
 
@@ -158,16 +149,9 @@ static void AddPepperBasedWidevine(
 #endif  // defined(ENABLE_PEPPER_CDMS)
 
 void AddChromeKeySystems(std::vector<KeySystemInfo>* key_systems_info) {
-
 #if defined(ENABLE_PEPPER_CDMS)
 #if defined(WIDEVINE_CDM_AVAILABLE)
-
   AddPepperBasedWidevine(key_systems_info);
-
 #endif  // defined(WIDEVINE_CDM_AVAILABLE)
 #endif  // defined(ENABLE_PEPPER_CDMS)
-
-#if defined(OS_ANDROID)
-  cdm::AddAndroidWidevine(key_systems_info);
-#endif  // defined(OS_ANDROID)
 }
diff --git a/script/lib/config.py b/script/lib/config.py
index 5a40efbff0f9..fb82c63adb4b 100644
--- a/script/lib/config.py
+++ b/script/lib/config.py
@@ -8,7 +8,7 @@ import sys
 
 BASE_URL = os.getenv('LIBCHROMIUMCONTENT_MIRROR') or \
     'https://s3.amazonaws.com/github-janky-artifacts/libchromiumcontent'
-LIBCHROMIUMCONTENT_COMMIT = 'ae1b1395d809df1c5bf3ff74257dcfecf69a91bd'
+LIBCHROMIUMCONTENT_COMMIT = '389d11b3bba3bdd536075c4743dec9ff4e0965ff'
 
 PLATFORM = {
   'cygwin': 'win32',
diff --git a/vendor/brightray b/vendor/brightray
index 7c7c09457026..3961caaa0a38 160000
--- a/vendor/brightray
+++ b/vendor/brightray
@@ -1 +1 @@
-Subproject commit 7c7c094570263c91d13e0eec754726730a43e642
+Subproject commit 3961caaa0a38aeb06e1afa4ef12fe9e7c6c24e5d