Source release v2.1.2-0-773 + third_party libs

Change-Id: Ia07608577b65b301c22a8ff4bf7f743c2d3f9274

core/test/config_test_env.h

@@ -6,11 +6,6 @@
 #include <string>
 #include "wv_cdm_types.h"
 
-namespace {
-const std::string kDefaultHttpsPort = "443";
-const std::string kDefaultHttpPort = "80";
-}
-
 namespace wvcdm {
 typedef enum {
   kGooglePlayServer,
@@ -25,24 +20,22 @@ class ConfigTestEnv {
     std::string url;
     std::string client_tag;
     std::string key_id;
-    std::string port;
-    bool use_chunked_transfer;
-    bool use_secure_transfer;
+    std::string offline_key_id;
   } LicenseServerConfiguration;
 
   explicit ConfigTestEnv(LicenseServerId server_id);
+  ConfigTestEnv(LicenseServerId server_id, bool streaming);
+  ConfigTestEnv(LicenseServerId server_id, bool streaming, bool renew,
+                bool release);
   ~ConfigTestEnv() {};
 
   const std::string& client_auth() const { return client_auth_; }
   const KeyId& key_id() const { return key_id_; }
   const CdmKeySystem& key_system() const { return key_system_; }
   const std::string& license_server() const { return license_server_; }
-  const std::string& port() const { return port_; }
   const std::string& provisioning_server_url() const {
     return provisioning_server_url_;
   }
-  bool use_chunked_transfer() { return use_chunked_transfer_; }
-  bool use_secure_transfer() { return use_secure_transfer_; }
   const KeyId& wrong_key_id() const { return wrong_key_id_; }
 
   void set_key_id(KeyId& key_id) { key_id_.assign(key_id); }
@@ -52,17 +45,15 @@ class ConfigTestEnv {
   void set_license_server(std::string& license_server) {
     license_server_.assign(license_server);
   }
-  void set_port(std::string& port) { port_.assign(port); }
 
  private:
+  void Init(LicenseServerId server_id);
+
   std::string client_auth_;
   KeyId key_id_;
   CdmKeySystem key_system_;
   std::string license_server_;
-  std::string port_;
   std::string provisioning_server_url_;
-  bool use_chunked_transfer_;
-  bool use_secure_transfer_;
   KeyId wrong_key_id_;
 
   CORE_DISALLOW_COPY_AND_ASSIGN(ConfigTestEnv);