media: Move Widevine signature of Framework into a bundle

chrome/common/media/cdm_host_file_path.cc

Index: chrome/common/media/cdm_host_file_path.cc
diff --git a/chrome/common/media/cdm_host_file_path.cc b/chrome/common/media/cdm_host_file_path.cc
index 5536ab7401e02417aae2cb50dba0c0aaaac103c1..6542d8cdb1406dfee93f2e7595547bf395943d06 100644
--- a/chrome/common/media/cdm_host_file_path.cc
+++ b/chrome/common/media/cdm_host_file_path.cc
@@ -81,13 +81,17 @@ void AddCdmHostFilePaths(
 
 #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()