media: Verify CDM Host files

chrome/common/chrome_content_client.cc

 // Copyright (c) 2012 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/chrome_content_client.h"
 
 #include <stdint.h>
 
 #include <map>
 #include <memory>
@@ skipping 11 matching lines @@
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/common/child_process_logging.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/crash_keys.h"
+#include "chrome/common/media/cdm_host_file_path.h"

[jrummell, 2017/01/18 21:46:45]

This is only needed if BUILDFLAG(ENABLE_PEPPER_CDMS). Since there is already a
bunch of includes conditionally added below, this should be part of it.

[xhwang, 2017/01/18 22:29:08]

Done.

 #include "chrome/common/pepper_flash.h"
 #include "chrome/common/secure_origin_whitelist.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/common_resources.h"
 #include "components/dom_distiller/core/url_constants.h"
 #include "components/version_info/version_info.h"
 #include "content/public/common/cdm_info.h"
 #include "content/public/common/content_constants.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/url_constants.h"
@@ skipping 506 matching lines @@
     const base::Version version(WIDEVINE_CDM_VERSION_STRING);
     DCHECK(version.IsValid());
     cdms->push_back(content::CdmInfo(kWidevineCdmType, version, cdm_path,
                                      codecs_supported));
   }
 #endif  // defined(WIDEVINE_CDM_AVAILABLE_NOT_COMPONENT)
 
   // TODO(jrummell): Add External Clear Key CDM for testing, if it's available.
 }
 
+#if BUILDFLAG(ENABLE_PEPPER_CDMS)
+void ChromeContentClient::AddContentDecryptionModuleHostFilePaths(
+    std::vector<content::CdmHostFilePath>* cdm_host_file_paths) {
+  AddCdmHostFilePaths(cdm_host_file_paths);

[Greg K, 2017/01/19 04:13:07]

Not sure, but should this be namespaced? Otherwise I expect it to be defined in
this file.

[xhwang, 2017/01/19 08:30:50]

Well, a lot of chrome/ classes (e.g. ChromeContentClient in this file) are not
namespaced. So typically I don't use "chrome" namespace even in chrome/. That
being said, code search tells me that "chrome" namespace is actually used in a
lot of files. So I'll use it :)

Done.

[Greg K, 2017/01/25 06:15:31]

Yeah I guess the owners can decide this one, was just pointing it out.

+}
+#endif
+
 static const char* const kChromeStandardURLSchemes[] = {
     extensions::kExtensionScheme,
     chrome::kChromeNativeScheme,
     chrome::kChromeSearchScheme,
     dom_distiller::kDomDistillerScheme,
 #if defined(OS_CHROMEOS)
     chrome::kCrosScheme,
 #endif
 };
 
@@ skipping 98 matching lines @@
   if (!origin_trial_policy_)
     origin_trial_policy_ = base::MakeUnique<ChromeOriginTrialPolicy>();
   return origin_trial_policy_.get();
 }
 
 #if defined(OS_ANDROID)
 media::MediaClientAndroid* ChromeContentClient::GetMediaClientAndroid() {
   return new ChromeMediaClientAndroid();
 }
 #endif  // OS_ANDROID