media: Simplify CdmHostFile(s)

media/cdm/ppapi/external_clear_key/clear_key_cdm.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/cdm/ppapi/external_clear_key/clear_key_cdm.h"
 
 #include <algorithm>
 #include <cstring>
 #include <sstream>
 #include <utility>
@@ skipping 254 matching lines @@
 
 const char* GetCdmVersion() {
   return kClearKeyCdmVersion;
 }
 
 static bool g_verify_host_files_result = false;
 
 // Makes sure files and corresponding signature files are readable but not
 // writable.
 bool VerifyCdmHost_0(const cdm::HostFile* host_files, uint32_t num_files) {
-  DVLOG(1) << __func__;
+  DVLOG(1) << __func__ << ": " << num_files;
 
-  // We should always have the CDM and CDM adapter.
-  // We might not have any common CDM host file (e.g. chrome) since we are
-  // running in browser_tests.
-  if (num_files < 2) {
+  // We should always have the CDM and CDM adapter and at lease one common file.
+  // The common CDM host file (e.g. chrome) might not exist since we are running
+  // in browser_tests.
+  if (num_files < 3) {

[Haoming Chen, 2017/03/31 16:46:53]

nit: kNumRequiredHostFile or kMinimumNumHostFile?

[xhwang, 2017/03/31 18:05:37]

Done.

     LOG(ERROR) << "Too few host files: " << num_files;
     g_verify_host_files_result = false;
     return true;
   }
 
+  int num_opened_files = 0;
   for (uint32_t i = 0; i < num_files; ++i) {
     const int kBytesToRead = 10;
     std::vector<char> buffer(kBytesToRead);
 
     base::File file(static_cast<base::PlatformFile>(host_files[i].file));
+    if (!file.IsValid())
+      continue;
+
+    num_opened_files++;
+
     int bytes_read = file.Read(0, buffer.data(), buffer.size());
     if (bytes_read != kBytesToRead) {
       LOG(ERROR) << "File bytes read: " << bytes_read;
       g_verify_host_files_result = false;
       return true;
     }
 
     // TODO(xhwang): Check that the files are not writable.
     // TODO(xhwang): Also verify the signature file when it's available.
   }
 
+  // We should always have the CDM and CDM adapter opened.
+  if (num_opened_files < 2) {

[Haoming Chen, 2017/03/31 16:46:53]

nit: kNumCdmFiles?

[xhwang, 2017/03/31 18:05:37]

Done.

+    LOG(ERROR) << "Too few opened files: " << num_opened_files;
+    g_verify_host_files_result = false;
+    return true;
+  }
+
   g_verify_host_files_result = true;
   return true;
 }
 
 namespace media {
 
 ClearKeyCdm::ClearKeyCdm(ClearKeyCdmHost* host,
                          const std::string& key_system,
                          const GURL& origin)
     : decryptor_(new AesDecryptor(
@@ skipping 735 matching lines @@
                                challenge.data(), challenge.size());
 }
 
 void ClearKeyCdm::VerifyCdmHostTest() {
   // VerifyCdmHost() should have already been called and test result stored
   // in |g_verify_host_files_result|.
   OnUnitTestComplete(g_verify_host_files_result);
 }
 
 }  // namespace media