media: Move Widevine signature of Framework into a bundle

chrome/common/media/cdm_host_file_path.cc

 // Copyright 2017 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/common/media/cdm_host_file_path.h"
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/macros.h"
@@ skipping 63 matching lines @@
   for (size_t i = 0; i < arraysize(kVersionedFiles); ++i) {
     base::FilePath file_path = version_dir.Append(kVersionedFiles[i]);
     DVLOG(2) << __func__ << ": versioned file " << i << " at "
              << file_path.value();
     cdm_host_file_paths->push_back(
         CdmHostFilePath(file_path, GetSigFilePath(file_path)));
   }
 
 #elif defined(OS_MACOSX)
 
-  // Framework signature is next to the framework directory, not next to
-  // the actual framework executable.
   base::FilePath chrome_framework_path =
       base::mac::FrameworkBundlePath().Append(chrome::kFrameworkExecutableName);
-  base::FilePath chrome_framework_sig_path =
-      GetSigFilePath(base::mac::FrameworkBundlePath().DirName().Append(
-          chrome::kFrameworkExecutableName));
+
+  // Framework signature is in the "Widevine Signature.bundle" next to the
+  // framework directory, not next to the actual framework executable.
+  static const base::FilePath::CharType kWidevineSignaturePath[] =

[Greg K, 2017/03/24 00:04:41]

Note that you could use the CFBundle APIs to fish out the location of the .sig
file but, I suspect this is fine since there is only one file in the bundle.

[xhwang, 2017/03/24 00:23:26]

Acknowledged. I'll keep this as is for now unless Robert disagrees.

+      FILE_PATH_LITERAL("Widevine Signature.bundle/Contents/Resources");
+  base::FilePath widevine_signature_path =
+      base::mac::FrameworkBundlePath().DirName().Append(kWidevineSignaturePath);
+  base::FilePath chrome_framework_sig_path = GetSigFilePath(
+      widevine_signature_path.Append(chrome::kFrameworkExecutableName));
 
   DVLOG(2) << __func__
            << ": chrome_framework_path=" << chrome_framework_path.value()
            << ", signature_path=" << chrome_framework_sig_path.value();
   cdm_host_file_paths->push_back(
       CdmHostFilePath(chrome_framework_path, chrome_framework_sig_path));
 
 #elif defined(OS_LINUX)
 
   base::FilePath chrome_exe_dir;
@@ skipping 13 matching lines @@
 
 void AddCdmHostFilePaths(
     std::vector<content::CdmHostFilePath>* cdm_host_file_paths) {
   NOTIMPLEMENTED() << "CDM host file paths need to be provided for the CDM to "
                       "verify the host.";
 }
 
 #endif  // defined(GOOGLE_CHROME_BUILD)
 
 }  // namespace chrome