Source release v3.0.1 + third_party

core/test/config_test_env.h

@@ -9,7 +9,8 @@
 namespace wvcdm {
 typedef enum {
   kGooglePlayServer,
-  kContentProtectionServer,
+  kContentProtectionUatServer,
+  kContentProtectionStagingServer,
 } LicenseServerId;
 
 // Configures default test environment.
@@ -21,13 +22,14 @@ class ConfigTestEnv {
     std::string client_tag;
     std::string key_id;
     std::string offline_key_id;
+    std::string service_certificate;
   } LicenseServerConfiguration;
 
   explicit ConfigTestEnv(LicenseServerId server_id);
   ConfigTestEnv(LicenseServerId server_id, bool streaming);
   ConfigTestEnv(LicenseServerId server_id, bool streaming, bool renew,
                 bool release);
-  ~ConfigTestEnv() {};
+  ~ConfigTestEnv(){};
 
   const std::string& client_auth() const { return client_auth_; }
   const KeyId& key_id() const { return key_id_; }
@@ -36,6 +38,9 @@ class ConfigTestEnv {
   const std::string& provisioning_server_url() const {
     return provisioning_server_url_;
   }
+  const std::string& service_certificate() const {
+    return service_certificate_;
+  }
   const KeyId& wrong_key_id() const { return wrong_key_id_; }
 
   void set_key_id(KeyId& key_id) { key_id_.assign(key_id); }
@@ -54,6 +59,7 @@ class ConfigTestEnv {
   CdmKeySystem key_system_;
   std::string license_server_;
   std::string provisioning_server_url_;
+  std::string service_certificate_;
   KeyId wrong_key_id_;
 
   CORE_DISALLOW_COPY_AND_ASSIGN(ConfigTestEnv);