diff --git a/libwvdrmengine/cdm/core/test/config_test_env.cpp b/libwvdrmengine/cdm/core/test/config_test_env.cpp index 7886977d..704947a3 100644 --- a/libwvdrmengine/cdm/core/test/config_test_env.cpp +++ b/libwvdrmengine/cdm/core/test/config_test_env.cpp @@ -50,13 +50,6 @@ const std::string kProductionProvisioningServerUrl = "certificateprovisioning/v1/devicecertificates/create" "?key=AIzaSyB-5OLKTx2iU5mko18DfdwK5611JIjbUhE"; -// Return production-rooted certificates that have test bit set, -// request_license_test uses this url. -const std::string kProductionTestProvisioningServerUrl = - "https://www.googleapis.com/" - "certificateprovisioning/v1exttest/devicecertificates/create" - "?key=AIzaSyB-5OLKTx2iU5mko18DfdwK5611JIjbUhE"; - const std::string kServerSdkLicenseServer = "http://kir03fcpg174.widevine.net/widevine/cgi-bin/drm.cgi"; @@ -77,7 +70,6 @@ ConfigTestEnv::ConfigTestEnv(LicenseServerId server_id) license_server_(license_servers[server_id].url), port_(license_servers[server_id].port), provisioning_server_url_(kProductionProvisioningServerUrl), - provisioning_test_server_url_(kProductionTestProvisioningServerUrl), server_sdk_license_server_(kServerSdkLicenseServer), use_chunked_transfer_(license_servers[server_id].use_chunked_transfer), use_secure_transfer_(license_servers[server_id].use_secure_transfer), diff --git a/libwvdrmengine/cdm/core/test/config_test_env.h b/libwvdrmengine/cdm/core/test/config_test_env.h index 95643e7c..46ce80fe 100644 --- a/libwvdrmengine/cdm/core/test/config_test_env.h +++ b/libwvdrmengine/cdm/core/test/config_test_env.h @@ -41,9 +41,6 @@ class ConfigTestEnv { const std::string& provisioning_server_url() const { return provisioning_server_url_; } - const std::string& provisioning_test_server_url() const { - return provisioning_test_server_url_; - } const std::string& server_sdk_license_server() const { return server_sdk_license_server_; } @@ -67,7 +64,6 @@ class ConfigTestEnv { std::string license_server_; std::string port_; std::string provisioning_server_url_; - std::string provisioning_test_server_url_; std::string server_sdk_license_server_; bool use_chunked_transfer_; bool use_secure_transfer_; diff --git a/libwvdrmengine/cdm/test/request_license_test.cpp b/libwvdrmengine/cdm/test/request_license_test.cpp index 3c3867db..695eb353 100644 --- a/libwvdrmengine/cdm/test/request_license_test.cpp +++ b/libwvdrmengine/cdm/test/request_license_test.cpp @@ -600,7 +600,7 @@ TEST_F(WvCdmRequestLicenseTest, ProvisioningTest) { EXPECT_EQ(provisioning_server_url, g_config->provisioning_server_url()); std::string response = - GetCertRequestResponse(g_config->provisioning_test_server_url()); + GetCertRequestResponse(g_config->provisioning_server_url()); EXPECT_NE(0, static_cast(response.size())); EXPECT_EQ(wvcdm::NO_ERROR, decryptor_.HandleProvisioningResponse(response, &cert, @@ -627,7 +627,7 @@ TEST_F(WvCdmRequestLicenseTest, ProvisioningRetryTest) { EXPECT_EQ(provisioning_server_url, g_config->provisioning_server_url()); std::string response = - GetCertRequestResponse(g_config->provisioning_test_server_url()); + GetCertRequestResponse(g_config->provisioning_server_url()); EXPECT_NE(0, static_cast(response.size())); EXPECT_EQ(wvcdm::NO_ERROR, decryptor_.HandleProvisioningResponse(response, &cert, @@ -636,7 +636,7 @@ TEST_F(WvCdmRequestLicenseTest, ProvisioningRetryTest) { EXPECT_EQ(0, static_cast(wrapped_key.size())); response = - GetCertRequestResponse(g_config->provisioning_test_server_url()); + GetCertRequestResponse(g_config->provisioning_server_url()); EXPECT_NE(0, static_cast(response.size())); EXPECT_EQ(wvcdm::UNKNOWN_ERROR, decryptor_.HandleProvisioningResponse(response, &cert, @@ -660,7 +660,7 @@ TEST_F(WvCdmRequestLicenseTest, DISABLED_X509ProvisioningTest) { EXPECT_EQ(provisioning_server_url, g_config->provisioning_server_url()); std::string response = - GetCertRequestResponse(g_config->provisioning_test_server_url()); + GetCertRequestResponse(g_config->provisioning_server_url()); EXPECT_NE(0, static_cast(response.size())); EXPECT_EQ(wvcdm::NO_ERROR, decryptor_.HandleProvisioningResponse(response, &cert, @@ -697,7 +697,7 @@ TEST_F(WvCdmRequestLicenseTest, PropertySetTest) { &key_msg_, &provisioning_server_url)); EXPECT_EQ(provisioning_server_url, g_config->provisioning_server_url()); std::string response = - GetCertRequestResponse(g_config->provisioning_test_server_url()); + GetCertRequestResponse(g_config->provisioning_server_url()); EXPECT_NE(0, static_cast(response.size())); EXPECT_EQ(NO_ERROR, decryptor_.HandleProvisioningResponse(response, &cert, @@ -747,7 +747,7 @@ TEST_F(WvCdmRequestLicenseTest, ForceL3Test) { &provisioning_server_url)); EXPECT_EQ(provisioning_server_url, g_config->provisioning_server_url()); std::string response = - GetCertRequestResponse(g_config->provisioning_test_server_url()); + GetCertRequestResponse(g_config->provisioning_server_url()); EXPECT_NE(0, static_cast(response.size())); EXPECT_EQ(NO_ERROR, decryptor_.HandleProvisioningResponse(response, &cert, @@ -1139,7 +1139,7 @@ TEST_F(WvCdmRequestLicenseTest, SecurityLevelPathBackwardCompatibility) { &key_msg_, &provisioning_server_url)); EXPECT_EQ(provisioning_server_url, g_config->provisioning_server_url()); std::string response = - GetCertRequestResponse(g_config->provisioning_test_server_url()); + GetCertRequestResponse(g_config->provisioning_server_url()); EXPECT_NE(0, static_cast(response.size())); EXPECT_EQ(wvcdm::NO_ERROR, decryptor_.HandleProvisioningResponse(response, &cert, @@ -1199,7 +1199,7 @@ TEST_F(WvCdmRequestLicenseTest, SecurityLevelPathBackwardCompatibility) { &provisioning_server_url)); EXPECT_EQ(provisioning_server_url, g_config->provisioning_server_url()); response = - GetCertRequestResponse(g_config->provisioning_test_server_url()); + GetCertRequestResponse(g_config->provisioning_server_url()); EXPECT_NE(0, static_cast(response.size())); EXPECT_EQ(NO_ERROR, decryptor_.HandleProvisioningResponse(response, &cert,