[CameraRoll] Update multidevice settings to use combined setup item.
Bug: 1221297
Change-Id: I746beb1a3f9cb3af9aa294825dadcc952c617561
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3389998
Reviewed-by: Jon Mann <[email protected]>
Reviewed-by: Dominic Battré <[email protected]>
Commit-Queue: Matt Walliser <[email protected]>
Cr-Commit-Position: refs/heads/main@{#972624}
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index b20b68d..94cf3615 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -721,6 +721,12 @@
"media_router.cloudservices.enabled";
#endif
+#if BUILDFLAG(IS_CHROMEOS_ASH)
+// Deprecated 02/2022
+const char kPhoneHubCameraRollPendingStatePrefName[] =
+ "multidevice_setup.phone_hub_camera_roll_pending_state";
+#endif // BUILDFLAG(IS_CHROMEOS_ASH)
+
// Register local state used only for migration (clearing or moving to a new
// key).
void RegisterLocalStatePrefsForMigration(PrefRegistrySimple* registry) {
@@ -939,6 +945,10 @@
registry->RegisterUint64Pref(kFlocIdFinchConfigVersionPrefKey, 0);
registry->RegisterUint64Pref(kFlocIdSortingLshVersionPrefKey, 0);
registry->RegisterTimePref(kFlocIdComputeTimePrefKey, base::Time());
+
+#if BUILDFLAG(IS_CHROMEOS_ASH)
+ registry->RegisterIntegerPref(kPhoneHubCameraRollPendingStatePrefName, 0);
+#endif // BUILDFLAG(IS_CHROMEOS_ASH)
}
} // namespace
@@ -1853,6 +1863,11 @@
profile_prefs->ClearPref(kMediaRouterEnableCloudServices);
#endif
+#if BUILDFLAG(IS_CHROMEOS_ASH)
+ // Added 02/2022
+ profile_prefs->ClearPref(kPhoneHubCameraRollPendingStatePrefName);
+#endif // BUILDFLAG(IS_CHROMEOS_ASH)
+
// Please don't delete the following line. It is used by PRESUBMIT.py.
// END_MIGRATE_OBSOLETE_PROFILE_PREFS
