Remove deprecated app-bound metrics implementation
These metrics are logged by the App-Bound key provider, which is
now enabled by default, so do not need their own separate logging.
This CL moves the extended logging as well as the
OSCrypt.AppBoundEncryption.SupportLevel metric to the provider.
All other histograms previously logged are removed, along with
the prefs.
OBSOLETE_HISTOGRAMS=OSCrypt.AppBoundEncryption.PathValidation.* superseded by OSCrypt.AppBoundProvider.*
BUG=40227925
Change-Id: I47c358acf2051f3552e9fd2ab2fedb648d636e0d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5594313
Reviewed-by: Scott Violet <[email protected]>
Commit-Queue: Will Harris <[email protected]>
Reviewed-by: Robert Kaplow <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1310244}
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 172360ce..e8487c1 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -472,7 +472,6 @@
#include "chrome/browser/font_prewarmer_tab_helper.h"
#include "chrome/browser/media/cdm_pref_service_helper.h"
#include "chrome/browser/media/media_foundation_service_monitor.h"
-#include "chrome/browser/os_crypt/app_bound_encryption_metrics_win.h"
#include "chrome/browser/os_crypt/app_bound_encryption_provider_win.h"
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
#include "chrome/browser/win/conflicts/incompatible_applications_updater.h"
@@ -993,6 +992,9 @@
// Deprecated 03/2024
constexpr char kOsCryptAppBoundFixedData2PrefName[] =
"os_crypt.app_bound_fixed_data2";
+// Deprecated 06/2024
+constexpr char kOsCryptAppBoundFixedData3PrefName[] =
+ "os_crypt.app_bound_fixed_data3";
#endif // BUILDFLAG(IS_WIN)
// Deprecated 02/2024.
@@ -1225,6 +1227,9 @@
// Deprecated 03/2024.
registry->RegisterStringPref(kOsCryptAppBoundFixedData2PrefName,
std::string());
+ // Deprecated 06/2024.
+ registry->RegisterStringPref(kOsCryptAppBoundFixedData3PrefName,
+ std::string());
#endif
#if BUILDFLAG(IS_CHROMEOS_ASH)
@@ -1866,7 +1871,6 @@
registry->RegisterBooleanPref(
policy::policy_prefs::kNativeWindowOcclusionEnabled, true);
MediaFoundationServiceMonitor::RegisterPrefs(registry);
- os_crypt::RegisterLocalStatePrefs(registry);
os_crypt_async::AppBoundEncryptionProviderWin::RegisterLocalPrefs(registry);
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
IncompatibleApplicationsUpdater::RegisterLocalStatePrefs(registry);
@@ -2511,6 +2515,8 @@
local_state->ClearPref(kOsCryptAppBoundFixedDataPrefName);
// Deprecated 03/2024.
local_state->ClearPref(kOsCryptAppBoundFixedData2PrefName);
+ // Deprecated 06/2024.
+ local_state->ClearPref(kOsCryptAppBoundFixedData3PrefName);
#endif
#if BUILDFLAG(IS_CHROMEOS_ASH)
