media: Copy Widevine CDM adapter signature file

chrome/browser/component_updater/widevine_cdm_component_installer.cc

 // Copyright (c) 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 "chrome/browser/component_updater/widevine_cdm_component_installer.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <string.h>
 #include <memory>
@@ skipping 86 matching lines @@
 //    Matches CDM_MODULE_VERSION.
 const char kCdmModuleVersionsName[] = "x-cdm-module-versions";
 //    Matches supported ContentDecryptionModule_* version(s).
 const char kCdmInterfaceVersionsName[] = "x-cdm-interface-versions";
 //    Matches supported Host_* version(s).
 const char kCdmHostVersionsName[] = "x-cdm-host-versions";
 //  The codecs list is a list of simple codec names (e.g. "vp8,vorbis").
 //  The list is passed to other parts of Chrome.
 const char kCdmCodecsListName[] = "x-cdm-codecs";
 
+// TODO(xhwang): Move this to a common place if needed.
+const base::FilePath::CharType kSignatureFileExtension[] =
+    FILE_PATH_LITERAL(".sig");
+
 // Widevine CDM is packaged as a multi-CRX. Widevine CDM binaries are located in
 // _platform_specific/<platform_arch> folder in the package. This function
 // returns the platform-specific subdirectory that is part of that multi-CRX.
 base::FilePath GetPlatformDirectory(const base::FilePath& base_path) {
   std::string platform_arch = kWidevineCdmPlatform;
   platform_arch += '_';
   platform_arch += kWidevineCdmArch;
   return base_path.AppendASCII("_platform_specific").AppendASCII(platform_arch);
 }
 
@@ skipping 256 matching lines @@
           << " adapter_install_path=" << adapter_install_path.AsUTF8Unsafe()
           << " adapter_version_path=" << adapter_version_path.AsUTF8Unsafe();
 
   base::FilePath adapter_source_path;
   PathService::Get(chrome::FILE_WIDEVINE_CDM_ADAPTER, &adapter_source_path);
 
   const std::string chrome_version = version_info::GetVersionNumber();
   DCHECK(!chrome_version.empty());
 
   // If we are not using bundled CDM and we don't have a valid adapter, create
-  // the version file and copy the CDM adapter from |adapter_source_path| to
-  // |adapter_install_path|.
+  // the version file, copy the CDM adapter signature file, and copy the CDM
+  // adapter.
   if (adapter_install_path != adapter_source_path &&
       !HasValidAdapter(adapter_version_path, adapter_install_path,
                        chrome_version)) {
     int bytes_written = base::WriteFile(
         adapter_version_path, chrome_version.data(), chrome_version.size());
     if (bytes_written < 0 ||
         static_cast<size_t>(bytes_written) != chrome_version.size()) {
       PLOG(WARNING) << "Failed to write Widevine CDM adapter version file.";
       // Ignore version file writing failure and try to copy the CDM adapter.
     }
 
+    // Copy Widevine CDM signature file if it exists.

[jrummell, 2017/01/06 02:04:00]

Since failing to find and/or copy this is not fatal, I think it should be after
the copy of the adapter file. That way if the output directory is not writable,
disk full, etc. it won't attempt 2 copy operations.

[xhwang, 2017/01/06 04:37:06]

Good point. Done.

+    base::FilePath adapter_sig_source_path =
+        adapter_source_path.AddExtension(kSignatureFileExtension);
+    if (base::PathExists(adapter_sig_source_path)) {
+      base::FilePath adapter_sig_install_path =
+          adapter_install_path.AddExtension(kSignatureFileExtension);
+      if (!base::CopyFile(adapter_sig_source_path, adapter_sig_install_path))
+        PLOG(WARNING) << "Failed to copy Widevine CDM adapter signature file.";
+    } else {
+      PLOG(WARNING) << "Widevine CDM adapter signature file does not exist.";

[jrummell, 2017/01/06 02:04:00]

Since there is a log if the file doesn't exist or can't be copied, why not
simply call base::CopyFile(
adapter_source_path.AddExtension(kSignatureFileExtension),
adapter_install_path.AddExtension(kSignatureFileExtension))? Does anybody see
these logging messages other than for testing?

[xhwang, 2017/01/06 04:37:07]

We did have cases where the CDM is missing and the user can provide us these
logs to help investigation. That's why we added these PLOGs.

But I guess since this isn't a fatal error (we ignore the failure case) the
additional log isn't very useful.

Done.

+    }
+
     if (!base::CopyFile(adapter_source_path, adapter_install_path)) {
       PLOG(WARNING) << "Failed to copy Widevine CDM adapter.";
       return;
     }
   }
 
   BrowserThread::PostTask(
       content::BrowserThread::UI, FROM_HERE,
       base::Bind(&RegisterWidevineCdmWithChrome, cdm_version, cdm_install_dir,
                  base::Passed(&manifest)));
@@ skipping 10 matching lines @@
   std::unique_ptr<ComponentInstallerTraits> traits(
       new WidevineCdmComponentInstallerTraits);
   // |cus| will take ownership of |installer| during installer->Register(cus).
   DefaultComponentInstaller* installer =
       new DefaultComponentInstaller(std::move(traits));
   installer->Register(cus, base::Closure());
 #endif  // defined(WIDEVINE_CDM_AVAILABLE) && defined(WIDEVINE_CDM_IS_COMPONENT)
 }
 
 }  // namespace component_updater