Fix Repository Inconsistencies from LMP

Back when we were being proactive about merging LMP changes to master
in the Widevine repository, there were a few changes that got merged
in a different form than what got checked into the Android repository.
Mostly, this happened due to several large core changes that were
brought over to the master branch in multiple parts so as not to break
other teams using the Widevine repository. This patch brings the two
trees in sync.

Change-Id: I4e56a742686d73d1c6ace209684ce0e8542fd93f

libwvdrmengine/cdm/test/request_license_test.cpp

@@ -1330,12 +1330,7 @@ TEST_P(WvCdmUsageInfoTest, UsageInfo) {
       EXPECT_EQ(NO_ERROR, decryptor_.ReleaseUsageInfo(release_msg));
     }
     status = decryptor_.GetUsageInfo(usage_info_data->app_id, &usage_info);
-    switch (status) {
-      case KEY_MESSAGE: EXPECT_FALSE(usage_info.empty()); break;
-      case NO_ERROR: EXPECT_TRUE(usage_info.empty()); break;
-      default: FAIL() << "GetUsageInfo failed with error "
-                    << static_cast<int>(status) ; break;
-    }
+    EXPECT_EQ(usage_info.empty() ? NO_ERROR : KEY_MESSAGE, status);
   }
 }
 
@@ -1362,6 +1357,7 @@ TEST_F(WvCdmRequestLicenseTest, QueryUnmodifiedSessionStatus) {
 
 TEST_F(WvCdmRequestLicenseTest, QueryModifiedSessionStatus) {
   // Test that L3 is returned when properties downgrade security.
+  Unprovision();
   Provision(kLevel3);
   TestWvCdmClientPropertySet property_set_L3;
   property_set_L3.set_security_level(QUERY_VALUE_SECURITY_LEVEL_L3);
@@ -1530,6 +1526,8 @@ TEST_F(WvCdmRequestLicenseTest, SecurityLevelPathBackwardCompatibility) {
 
   EXPECT_TRUE(file.List(base_path, &files));
   int number_of_new_files = files.size() - number_of_files;
+  // There should be a new license file, and maybe a new usage table
+  // file.
   EXPECT_LE(1, number_of_new_files);
   EXPECT_GE(2, number_of_new_files);