Merge cdm_pref_service.mojom with platform_verification.mojom
This change merges two Mojo interface used by the CDM,
cdm_pref_service.mojom and platform_verification.mojom into a new
cdm_document_service.mojom interface.
Bug: 1188717
Change-Id: I1971ef0fc94003cd482d44dd72beb0152b50d47f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2920990
Reviewed-by: Alex Gough <[email protected]>
Reviewed-by: Xiaohan Wang <[email protected]>
Reviewed-by: Dominic Battré <[email protected]>
Commit-Queue: Alex St-Onge <[email protected]>
Cr-Commit-Position: refs/heads/master@{#890258}
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 3f676a52..26723c3 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -379,7 +379,7 @@
#if defined(OS_WIN)
#include "chrome/browser/component_updater/sw_reporter_installer_win.h"
-#include "chrome/browser/media/cdm_pref_service_impl.h"
+#include "chrome/browser/media/cdm_pref_service_helper.h"
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
#include "chrome/browser/win/conflicts/incompatible_applications_updater.h"
#include "chrome/browser/win/conflicts/module_database.h"
@@ -1206,7 +1206,7 @@
#endif
#if defined(OS_WIN)
- CdmPrefServiceImpl::RegisterProfilePrefs(registry);
+ CdmPrefServiceHelper::RegisterProfilePrefs(registry);
component_updater::RegisterProfilePrefsForSwReporter(registry);
NetworkProfileBubble::RegisterProfilePrefs(registry);
safe_browsing::SettingsResetPromptPrefsManager::RegisterProfilePrefs(
