Clear logging in Widevine CDM and default component installer

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 <string>
@@ skipping 101 matching lines @@
   return base_path.AppendASCII("_platform_specific").AppendASCII(platform_arch);
 }
 
 bool MakeWidevineCdmPluginInfo(const base::Version& version,
                                const base::FilePath& cdm_install_dir,
                                const std::string& codecs,
                                content::PepperPluginInfo* plugin_info) {
   if (!version.IsValid() ||
       version.components().size() !=
           static_cast<size_t>(kWidevineCdmVersionNumComponents)) {
+    DVLOG(1) << "Invalid version.";
     return false;
   }
 
   plugin_info->is_internal = false;
   // Widevine CDM must run out of process.
   plugin_info->is_out_of_process = true;
   plugin_info->path = GetPlatformDirectory(cdm_install_dir)
                           .AppendASCII(kWidevineCdmAdapterFileName);
   plugin_info->name = kWidevineCdmDisplayName;
   plugin_info->description = kWidevineCdmDescription +
@@ skipping 15 matching lines @@
   return true;
 }
 
 typedef bool (*VersionCheckFunc)(int version);
 
 bool CheckForCompatibleVersion(const base::DictionaryValue& manifest,
                                const std::string version_name,
                                VersionCheckFunc version_check_func) {
   std::string versions_string;
   if (!manifest.GetString(version_name, &versions_string)) {
-    DLOG(WARNING) << "Widevine CDM component manifest missing " << version_name;
+    DVLOG(1) << "Widevine CDM component manifest missing " << version_name;
     return false;
   }
-  DLOG_IF(WARNING, versions_string.empty())
+  DVLOG_IF(1, versions_string.empty())
       << "Widevine CDM component manifest has empty " << version_name;
 
   for (const base::StringPiece& ver_str : base::SplitStringPiece(
            versions_string, std::string(1, kCdmValueDelimiter),
            base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL)) {
     int version = 0;
     if (base::StringToInt(ver_str, &version))
       if (version_check_func(version))
         return true;
   }
 
-  DLOG(WARNING) << "Widevine CDM component manifest has no supported "
-                << version_name << " in '" << versions_string << "'";
+  DVLOG(1) << "Widevine CDM component manifest has no supported "
+           << version_name << " in '" << versions_string << "'";
   return false;
 }
 
 // Returns whether the CDM's API versions, as specified in the manifest, are
 // compatible with this Chrome binary.
 // Checks the module API, CDM interface API, and Host API.
 // This should never fail except in rare cases where the component has not been
 // updated recently or the user downgrades Chrome.
 bool IsCompatibleWithChrome(const base::DictionaryValue& manifest) {
   return CheckForCompatibleVersion(manifest,
                                    kCdmModuleVersionsName,
                                    media::IsSupportedCdmModuleVersion) &&
          CheckForCompatibleVersion(manifest,
                                    kCdmInterfaceVersionsName,
                                    media::IsSupportedCdmInterfaceVersion) &&
          CheckForCompatibleVersion(manifest,
                                    kCdmHostVersionsName,
                                    media::IsSupportedCdmHostVersion);
 }
 
 std::string GetCodecs(const base::DictionaryValue& manifest) {
   std::string codecs;
   if (manifest.GetStringASCII(kCdmCodecsListName, &codecs)) {
-    DLOG_IF(WARNING, codecs.empty())
+    DVLOG_IF(1, codecs.empty())
         << "Widevine CDM component manifest has empty codecs list";
   } else {
-    DLOG(WARNING) << "Widevine CDM component manifest is missing codecs";
+    DVLOG(1) << "Widevine CDM component manifest is missing codecs";
   }
   return codecs;
 }
 
 void RegisterWidevineCdmWithChrome(
     const base::Version& cdm_version,
     const base::FilePath& cdm_install_dir,
     std::unique_ptr<base::DictionaryValue> manifest) {
-  LOG(WARNING) << __FUNCTION__;
-
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   const std::string codecs = GetCodecs(*manifest);
 
   content::PepperPluginInfo plugin_info;
   if (!MakeWidevineCdmPluginInfo(cdm_version, cdm_install_dir, codecs,
                                  &plugin_info)) {
     return;
   }
 
+  VLOG(1) << "Register Widevine CDM with Chrome";
+
   // true = Add to beginning of list to override any existing registrations.
   PluginService::GetInstance()->RegisterInternalPlugin(
       plugin_info.ToWebPluginInfo(), true);
   // Tell the browser to refresh the plugin list. Then tell all renderers to
   // update their plugin list caches.
   PluginService::GetInstance()->RefreshPlugins();
   PluginService::GetInstance()->PurgePluginListCache(NULL, false);
 
   // Also register Widevine with the CdmService.
   const base::FilePath cdm_path =
@@ skipping 82 matching lines @@
     const base::FilePath& install_dir) const {
   return IsCompatibleWithChrome(manifest) &&
          base::PathExists(GetPlatformDirectory(install_dir)
                               .AppendASCII(kWidevineCdmFileName));
 }
 
 // The base directory on Windows looks like:
 // <profile>\AppData\Local\Google\Chrome\User Data\WidevineCdm\.
 base::FilePath WidevineCdmComponentInstallerTraits::GetRelativeInstallDir()
     const {
-  // Add LOG(WARNING) here and below to help investigate http://crbug.com/614745
-  // TODO(xhwang): Remove LOG(WARNING)s in this file after investigation.
-  LOG(WARNING) << __FUNCTION__;
   return base::FilePath(FILE_PATH_LITERAL("WidevineCdm"));
 }
 
 void WidevineCdmComponentInstallerTraits::GetHash(
     std::vector<uint8_t>* hash) const {
   hash->assign(kSha2Hash, kSha2Hash + arraysize(kSha2Hash));
 }
 
 std::string WidevineCdmComponentInstallerTraits::GetName() const {
   return kWidevineCdmDisplayName;
 }
 
 std::string WidevineCdmComponentInstallerTraits::GetAp() const {
   return std::string();
 }
 
 static bool HasValidAdapter(const base::FilePath& adapter_version_path,
                             const base::FilePath& adapter_install_path,
                             const std::string& chrome_version) {
   std::string adapter_version;
   return base::ReadFileToString(adapter_version_path, &adapter_version) &&
          adapter_version == chrome_version &&
          base::PathExists(adapter_install_path);
 }
 
 void WidevineCdmComponentInstallerTraits::UpdateCdmAdapter(
     const base::Version& cdm_version,
     const base::FilePath& cdm_install_dir,
     std::unique_ptr<base::DictionaryValue> manifest) {
-  LOG(WARNING) << __FUNCTION__;
-
   const base::FilePath adapter_version_path =
       GetPlatformDirectory(cdm_install_dir).AppendASCII(kCdmAdapterVersionName);
   const base::FilePath adapter_install_path =
       GetPlatformDirectory(cdm_install_dir)
           .AppendASCII(kWidevineCdmAdapterFileName);
 
   VLOG(1) << "UpdateCdmAdapter: version" << cdm_version.GetString()
           << " adapter_install_path=" << adapter_install_path.AsUTF8Unsafe()
           << " adapter_version_path=" << adapter_version_path.AsUTF8Unsafe();
 
@@ skipping 40 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