media: Move the callsite of CdmHostFiles::InitVerification()

content/common/media/cdm_host_files.cc

 // Copyright 2016 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 "content/common/media/cdm_host_files.h"
 
 #include <map>
 #include <memory>
 #include <vector>
 
@@ skipping 116 matching lines @@
 // static
 std::unique_ptr<CdmHostFiles> CdmHostFiles::Create(
     const base::FilePath& cdm_adapter_path) {
   DVLOG(1) << __func__;
   std::unique_ptr<CdmHostFiles> cdm_host_files =
       base::MakeUnique<CdmHostFiles>();
   cdm_host_files->OpenFiles(cdm_adapter_path);
   return cdm_host_files;
 }
 
-bool CdmHostFiles::VerifyFiles(base::NativeLibrary cdm_adapter_library,
-                               const base::FilePath& cdm_adapter_path) {
+bool CdmHostFiles::InitVerification(base::NativeLibrary cdm_adapter_library,
+                                    const base::FilePath& cdm_adapter_path) {
   DVLOG(1) << __func__;
   DCHECK(cdm_adapter_library);
 
   // Get function pointer exported by the CDM.
   // See media/cdm/api/content_decryption_module_ext.h.
-  using VerifyCdmHostFunc =
+  using InitVerificationFunc =
       bool (*)(const cdm::HostFile* cdm_host_files, uint32_t num_files);
-  static const char kVerifyCdmHostFuncName[] = "VerifyCdmHost_0";
+  static const char kInitVerificationFuncName[] = "VerifyCdmHost_0";
 
   base::NativeLibrary cdm_library;
 #if defined(OS_LINUX) || defined(OS_MACOSX)
   // On POSIX, "the dlsym() function shall search for the named symbol in all
   // objects loaded automatically as a result of loading the object referenced
   // by handle". Since the CDM is loaded automatically as a result of loading
   // the CDM adapter, we can just use the adapter to look for CDM symbols.
   cdm_library = cdm_adapter_library;
 #elif defined(OS_WIN)
   // On Windows, we have manually load the CDM.
   base::ScopedNativeLibrary scoped_cdm_library;
   base::NativeLibraryLoadError error;
   scoped_cdm_library.Reset(
       base::LoadNativeLibrary(GetCdmPath(cdm_adapter_path), &error));
   if (!scoped_cdm_library.is_valid()) {
     LOG(ERROR) << "Failed to load CDM (error: " << error.ToString() << ")";
     CloseAllFiles();
     return true;
   }
   cdm_library = scoped_cdm_library.get();
 #endif
 
-  VerifyCdmHostFunc verify_cdm_host_func = reinterpret_cast<VerifyCdmHostFunc>(
-      base::GetFunctionPointerFromNativeLibrary(cdm_library,
-                                                kVerifyCdmHostFuncName));
-  if (!verify_cdm_host_func) {
-    LOG(ERROR) << "Function " << kVerifyCdmHostFuncName << " not found.";
+  InitVerificationFunc init_verification_func =
+      reinterpret_cast<InitVerificationFunc>(
+          base::GetFunctionPointerFromNativeLibrary(cdm_library,
+                                                    kInitVerificationFuncName));
+  if (!init_verification_func) {
+    LOG(ERROR) << "Function " << kInitVerificationFuncName << " not found.";
     CloseAllFiles();
     return true;
   }
 
   // Fills |cdm_host_files| with common and CDM specific files for
   // |cdm_adapter_path|.
   std::vector<cdm::HostFile> cdm_host_files;
   TakePlatformFiles(cdm_adapter_path, &cdm_host_files);
 
   // std::vector::data() is not guaranteed to be nullptr when empty().
   const cdm::HostFile* cdm_host_files_ptr =
       cdm_host_files.empty() ? nullptr : cdm_host_files.data();
 
-  // Call |verify_cdm_host_func| on the CDM with |cdm_host_files|. Note that
+  // Call |init_verification_func| on the CDM with |cdm_host_files|. Note that
   // the ownership of these files are transferred to the CDM, which will close
   // the files immediately after use.
-  DVLOG(1) << __func__ << ": Calling " << kVerifyCdmHostFuncName << "() with "
-           << cdm_host_files.size() << " files.";
+  DVLOG(1) << __func__ << ": Calling " << kInitVerificationFuncName
+           << "() with " << cdm_host_files.size() << " files.";
   for (const auto& host_file : cdm_host_files) {
     DVLOG(1) << " - File Path: " << host_file.file_path;
     DVLOG(1) << " - File: " << host_file.file;
     DVLOG(1) << " - Sig File: " << host_file.sig_file;
   }
 
-  if (!verify_cdm_host_func(cdm_host_files_ptr, cdm_host_files.size())) {
+  if (!init_verification_func(cdm_host_files_ptr, cdm_host_files.size())) {
     DVLOG(1) << "Failed to verify CDM host.";
     CloseAllFiles();
     return false;
   }
 
   // Close all files not passed to the CDM.
   CloseAllFiles();
   return true;
 }
 
@@ skipping 75 matching lines @@
   cdm_specific_files_map_.clear();
 }
 
 // Question(xhwang): Any better way to check whether a plugin is a CDM? Maybe
 // when we register the plugin we can set some flag explicitly?
 bool IsCdm(const base::FilePath& cdm_adapter_path) {
   return !GetCdmPath(cdm_adapter_path).empty();
 }
 
 }  // namespace content