Merge Tweaks Originating in Merge Review Comments

This merges several small changes that were made in response to
comments that arose when LMP changes were merged into the Widevine
repository's master branch.

Change-Id: Ifec968af54dbc3288f24654ec0c6ca9b5962e1aa

libwvdrmengine/cdm/test/request_license_test.cpp

@@ -1559,9 +1559,16 @@ TEST_F(WvCdmRequestLicenseTest, SecurityLevelPathBackwardCompatibility) {
   TestWvCdmClientPropertySet property_set;
   property_set.set_security_level(QUERY_VALUE_SECURITY_LEVEL_L3);
 
-  EXPECT_EQ(wvcdm::NEED_PROVISIONING,
+  EXPECT_EQ(NO_ERROR,
             decryptor_.OpenSession(g_key_system, &property_set, &session_id_));
 
+  wvcdm::CdmAppParameterMap app_parameters;
+  std::string server_url;
+  EXPECT_EQ(wvcdm::NEED_PROVISIONING,
+            decryptor_.GenerateKeyRequest(session_id_, key_set_id, "video/mp4",
+                                          key_id, kLicenseTypeStreaming,
+                                          app_parameters, NULL, &key_msg_,
+                                          &server_url));
   EXPECT_EQ(NO_ERROR, decryptor_.GetProvisioningRequest(
                           cert_type, cert_authority, &key_msg_,
                           &provisioning_server_url));