media: Rename CdmService to CdmRegistry

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 15 matching lines @@
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/widevine_cdm_constants.h"
 #include "components/component_updater/component_updater_service.h"
 #include "components/component_updater/default_component_installer.h"
 #include "components/version_info/version_info.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/cdm_service.h"
+#include "content/public/browser/cdm_registry.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/common/cdm_info.h"
 #include "content/public/common/pepper_plugin_info.h"
 #include "media/cdm/supported_cdm_versions.h"
 #include "third_party/widevine/cdm/widevine_cdm_common.h"
 
 #include "widevine_cdm_version.h"  // In SHARED_INTERMEDIATE_DIR. NOLINT
 
 using content::BrowserThread;
-using content::CdmService;
+using content::CdmRegistry;
 using content::PluginService;
 
 namespace component_updater {
 
 #if defined(WIDEVINE_CDM_AVAILABLE) && defined(WIDEVINE_CDM_IS_COMPONENT)
 
 namespace {
 
 // CRX hash. The extension id is: oimompecagnajdejgnnjijobebaeigek.
 const uint8_t kSha2Hash[] = {0xe8, 0xce, 0xcf, 0x42, 0x06, 0xd0, 0x93, 0x49,
@@ skipping 164 matching lines @@
   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.
+  // Also register Widevine with the CdmRegistry.
   const base::FilePath cdm_path =
       GetPlatformDirectory(cdm_install_dir)
           .AppendASCII(base::GetNativeLibraryName(kWidevineCdmLibraryName));
   const std::vector<std::string> supported_codecs = base::SplitString(
       codecs, std::string(1, kCdmSupportedCodecsValueDelimiter),
       base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
-  CdmService::GetInstance()->RegisterCdm(content::CdmInfo(
+  CdmRegistry::GetInstance()->RegisterCdm(content::CdmInfo(
       kWidevineCdmType, cdm_version, cdm_path, supported_codecs));
 }
 
 }  // namespace
 
 class WidevineCdmComponentInstallerTraits : public ComponentInstallerTraits {
  public:
   WidevineCdmComponentInstallerTraits();
   ~WidevineCdmComponentInstallerTraits() override {}
 
@@ skipping 167 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