media: Verify CDM Host files

chrome/browser/media/encrypted_media_browsertest.cc

Index: chrome/browser/media/encrypted_media_browsertest.cc
diff --git a/chrome/browser/media/encrypted_media_browsertest.cc b/chrome/browser/media/encrypted_media_browsertest.cc
index e61ef839ce447a79dcd04e5c71f376cc657f6794..350f0316af79de0e6bb1d20fe043dde7d5a40336 100644
--- a/chrome/browser/media/encrypted_media_browsertest.cc
+++ b/chrome/browser/media/encrypted_media_browsertest.cc
@@ -59,6 +59,8 @@ const char kExternalClearKeyPlatformVerificationTestKeySystem[] =
     "org.chromium.externalclearkey.platformverificationtest";
 const char kExternalClearKeyCrashKeySystem[] =
     "org.chromium.externalclearkey.crash";
+const char kExternalClearKeyVerifyHostFilesTestKeySystem[] =

[tinskip1, 2017/01/19 03:42:46]

Suggest: Shorten from VerifyHostFiles to VerifyHost all around.

[xhwang, 2017/01/19 08:30:51]

The API change has been landed in
https://chromiumcodereview.appspot.com/2631463003/. I wish I got this suggestion
earlier :) I'll send another CL (with a DEPS roll) to change the API if you feel
strongly about this.

[tinskip1, 2017/01/19 17:36:38]

Well, "verifyhostfiles" IMO gives away what we're doing.  We'd rather not do
that.

Also, we ought to version.

Returning at least a bool is a good idea.

Please let's make the changes; they are rather minimal IMO.

[xhwang, 2017/01/19 17:46:06]

I can do these two.
 
What do you expect Chromium do when the return value is false?
 

[tinskip1, 2017/01/19 18:02:17]

Fail as if it could not load the CDM.

+    "org.chromium.externalclearkey.verifyhostfilestest";
 
 // Supported media types.
 const char kWebMVorbisAudioOnly[] = "audio/webm; codecs=\"vorbis\"";
@@ -273,6 +275,8 @@ class EncryptedMediaTestBase : public MediaBrowserTest {
       RegisterPepperCdm(command_line, kClearKeyCdmBaseDirectory,
                         kClearKeyCdmAdapterFileName, kClearKeyCdmDisplayName,
                         kClearKeyCdmPepperMimeType);
+      // Need to tell CdmHostFile(s) to ignore missing CDM host files in tests.
+      command_line->AppendSwitch(switches::kIgnoreMissingCdmHostFileForTesting);
       command_line->AppendSwitchASCII(switches::kEnableFeatures,
                                       media::kExternalClearKeyForTesting.name);
     }
@@ -672,4 +676,9 @@ IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, LoadUnknownSession) {
                    kEmeSessionNotFound);
 }
 
+IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, VerifyHostFilesTest) {
+  TestNonPlaybackCases(kExternalClearKeyVerifyHostFilesTestKeySystem,
+                       kUnitTestSuccess);
+}
+
 #endif  // BUILDFLAG(ENABLE_PEPPER_CDMS)