Source release v3.0.0-0-g8d3792b-ce + third_party

Change-Id: I399e71ddfffcd436171d1c60283c63ab4658e0b1

core/test/config_test_env.cpp

@@ -2,10 +2,14 @@
 
 #include "config_test_env.h"
 
+namespace wvcdm {
+
 namespace {
+
 const std::string kWidevineKeySystem = "com.widevine.alpha";
 
-// Content Protection license server data
+// Content Protection license server (UAT) data
+// For staging server replace url with http://wv-staging-proxy.appspot.com/proxy
 const std::string kCpLicenseServer = "http://widevine-proxy.appspot.com/proxy";
 const std::string kCpClientAuth = "";
 const std::string kCpKeyId =
@@ -26,7 +30,7 @@ const std::string kCpOfflineKeyId =
     "00000020"                          // pssh data size
     // pssh data:
     "08011a0d7769646576696e655f746573"
-    "74220d6f66666c696e655f636c697031";
+    "74220d6f66666c696e655f636c697032";
 
 // Google Play license server data
 const std::string kGpLicenseServer =
@@ -72,17 +76,15 @@ const std::string kProductionProvisioningServerUrl =
     "certificateprovisioning/v1/devicecertificates/create"
     "?key=AIzaSyB-5OLKTx2iU5mko18DfdwK5611JIjbUhE";
 
-const wvcdm::ConfigTestEnv::LicenseServerConfiguration license_servers[] = {
-    {wvcdm::kGooglePlayServer, kGpLicenseServer, kGpClientAuth, kGpKeyId,
+const ConfigTestEnv::LicenseServerConfiguration license_servers[] = {
+    {kGooglePlayServer, kGpLicenseServer, kGpClientAuth, kGpKeyId,
      kGpOfflineKeyId},
-    {wvcdm::kContentProtectionServer, kCpLicenseServer, kCpClientAuth, kCpKeyId,
+    {kContentProtectionServer, kCpLicenseServer, kCpClientAuth, kCpKeyId,
      kCpOfflineKeyId},
 };
 
 }  // namespace
 
-namespace wvcdm {
-
 ConfigTestEnv::ConfigTestEnv(LicenseServerId server_id) { Init(server_id); }
 
 ConfigTestEnv::ConfigTestEnv(LicenseServerId server_id, bool streaming) {