[Oobe WebUI] Start deprecation of set_user_acted_method_path

Add external_api_prefix into the OobeScreenId which would be used to construct javascript functions and callback names. Bug: 1312879, 1310195, 1309022, 1298392, 1312880 Change-Id: I35e1ea5949c19a59176353efdf985494780afbc8 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3568223 Reviewed-by: Danila Kuzmin <dkuzmin@google.com> Commit-Queue: Roman Sorokin <rsorokin@chromium.org> Auto-Submit: Roman Sorokin <rsorokin@chromium.org> Cr-Commit-Position: refs/heads/main@{#988458}
chromium · Apr 4, 2022 · cebcb66 · cebcb66
1 parent 1c357ea
commit cebcb66
Show file tree

Hide file tree

Showing 49 changed files with 85 additions and 52 deletions.
diff --git a/chrome/browser/ash/login/oobe_screen.cc b/chrome/browser/ash/login/oobe_screen.cc
@@ -10,7 +10,13 @@ namespace ash {
 
 OobeScreenId::OobeScreenId(const std::string& name) : name(name) {}
 
-OobeScreenId::OobeScreenId(const StaticOobeScreenId& id) : name(id.name) {}
+OobeScreenId::OobeScreenId(const StaticOobeScreenId& id)
+    : name(id.name) {
+  if (id.external_api_prefix)
+    external_api_prefix = id.external_api_prefix;
+  // TODO(https://crbug.com/1312879): Uncomment when the bug is fixed.
+  // DCHECK(!external_api_prefix.empty());
+}
 
 bool OobeScreenId::operator==(const OobeScreenId& rhs) const {
   return name == rhs.name;

diff --git a/chrome/browser/ash/login/oobe_screen.h b/chrome/browser/ash/login/oobe_screen.h
@@ -28,13 +28,14 @@ struct StaticOobeScreenId;
 // Identifiers an OOBE screen.
 struct OobeScreenId {
   // Create an identifier from a string.
+  // TODO(https://crbug.com/1312880): Remove this.
   explicit OobeScreenId(const std::string& id);
   // Create an identifier from a statically created identifier. This is implicit
   // to make StaticOobeScreenId act more like OobeScreenId.
   OobeScreenId(const StaticOobeScreenId& id);
 
-  // Name of the screen.
   std::string name;
+  std::string external_api_prefix;
 
   bool operator==(const OobeScreenId& rhs) const;
   bool operator!=(const OobeScreenId& rhs) const;
@@ -47,6 +48,7 @@ struct OobeScreenId {
 // the data in the binary instead of std::string.
 struct StaticOobeScreenId {
   const char* name;
+  const char* external_api_prefix = nullptr;
 
   OobeScreenId AsId() const;
 };

diff --git a/chrome/browser/ui/webui/chromeos/login/active_directory_login_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/active_directory_login_screen_handler.cc
@@ -22,7 +22,8 @@ constexpr StaticOobeScreenId ActiveDirectoryLoginView::kScreenId;
 
 ActiveDirectoryLoginScreenHandler::ActiveDirectoryLoginScreenHandler()
     : BaseScreenHandler(kScreenId) {
-  set_user_acted_method_path("login.ActiveDirectoryLoginScreen.userActed");
+  set_user_acted_method_path_deprecated(
+      "login.ActiveDirectoryLoginScreen.userActed");
 }
 
 ActiveDirectoryLoginScreenHandler::~ActiveDirectoryLoginScreenHandler() {

diff --git a/chrome/browser/ui/webui/chromeos/login/active_directory_password_change_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/active_directory_password_change_screen_handler.cc
@@ -23,7 +23,7 @@ constexpr StaticOobeScreenId ActiveDirectoryPasswordChangeView::kScreenId;
 ActiveDirectoryPasswordChangeScreenHandler::
     ActiveDirectoryPasswordChangeScreenHandler()
     : BaseScreenHandler(kScreenId) {
-  set_user_acted_method_path(
+  set_user_acted_method_path_deprecated(
       "login.ActiveDirectoryPasswordChangeScreen.userActed");
 }
 

diff --git a/chrome/browser/ui/webui/chromeos/login/app_downloading_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/app_downloading_screen_handler.cc
@@ -33,7 +33,7 @@ constexpr StaticOobeScreenId AppDownloadingScreenView::kScreenId;
 
 AppDownloadingScreenHandler::AppDownloadingScreenHandler()
     : BaseScreenHandler(kScreenId) {
-  set_user_acted_method_path("login.AppDownloadingScreen.userActed");
+  set_user_acted_method_path_deprecated("login.AppDownloadingScreen.userActed");
 }
 
 AppDownloadingScreenHandler::~AppDownloadingScreenHandler() {

diff --git a/chrome/browser/ui/webui/chromeos/login/arc_terms_of_service_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/arc_terms_of_service_screen_handler.cc
@@ -52,7 +52,8 @@ ArcTermsOfServiceScreenHandler::ArcTermsOfServiceScreenHandler()
     : BaseScreenHandler(kScreenId),
       is_child_account_(
           user_manager::UserManager::Get()->IsLoggedInAsChildUser()) {
-  set_user_acted_method_path("login.ArcTermsOfServiceScreen.userActed");
+  set_user_acted_method_path_deprecated(
+      "login.ArcTermsOfServiceScreen.userActed");
 }
 
 ArcTermsOfServiceScreenHandler::~ArcTermsOfServiceScreenHandler() {

diff --git a/chrome/browser/ui/webui/chromeos/login/assistant_optin_flow_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/assistant_optin_flow_screen_handler.cc
@@ -63,7 +63,8 @@ constexpr StaticOobeScreenId AssistantOptInFlowScreenView::kScreenId;
 
 AssistantOptInFlowScreenHandler::AssistantOptInFlowScreenHandler()
     : BaseScreenHandler(kScreenId) {
-  set_user_acted_method_path("login.AssistantOptInFlowScreen.userActed");
+  set_user_acted_method_path_deprecated(
+      "login.AssistantOptInFlowScreen.userActed");
 }
 
 AssistantOptInFlowScreenHandler::~AssistantOptInFlowScreenHandler() {

diff --git a/chrome/browser/ui/webui/chromeos/login/base_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/base_screen_handler.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
 
+#include "base/strings/strcat.h"
 #include "chrome/browser/ash/login/oobe_screen.h"
 #include "chrome/browser/ash/login/screens/base_screen.h"
 #include "chrome/browser/ui/webui/chromeos/login/base_webui_handler.h"
@@ -14,6 +15,10 @@ namespace chromeos {
 BaseScreenHandler::BaseScreenHandler(OobeScreenId oobe_screen)
     : oobe_screen_(oobe_screen) {
   DCHECK_NE(oobe_screen_.name, OobeScreen::SCREEN_UNKNOWN.name);
+  if (!oobe_screen_.external_api_prefix.empty()) {
+    user_acted_method_path_ = base::StrCat(
+        {"login.", oobe_screen_.external_api_prefix, ".userActed"});
+  }
 }
 
 BaseScreenHandler::~BaseScreenHandler() = default;

diff --git a/chrome/browser/ui/webui/chromeos/login/base_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/base_screen_handler.h
@@ -44,7 +44,9 @@ class BaseScreenHandler : public BaseWebUIHandler {
   //
   // If this is not called then userActed-style callbacks will not be available
   // for the screen.
-  void set_user_acted_method_path(const std::string& user_acted_method_path) {
+  // DEPRECATED: Use 'StaticOobeScreenId::external_api_prefix' instead.
+  void set_user_acted_method_path_deprecated(
+      const std::string& user_acted_method_path) {
     user_acted_method_path_ = user_acted_method_path;
   }
 

diff --git a/chrome/browser/ui/webui/chromeos/login/consolidated_consent_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/consolidated_consent_screen_handler.cc
@@ -22,7 +22,8 @@ constexpr StaticOobeScreenId ConsolidatedConsentScreenView::kScreenId;
 
 ConsolidatedConsentScreenHandler::ConsolidatedConsentScreenHandler()
     : BaseScreenHandler(kScreenId) {
-  set_user_acted_method_path("login.ConsolidatedConsentScreen.userActed");
+  set_user_acted_method_path_deprecated(
+      "login.ConsolidatedConsentScreen.userActed");
 }
 
 ConsolidatedConsentScreenHandler::~ConsolidatedConsentScreenHandler() {

diff --git a/chrome/browser/ui/webui/chromeos/login/demo_preferences_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/demo_preferences_screen_handler.cc
@@ -17,7 +17,8 @@ DemoPreferencesScreenView::~DemoPreferencesScreenView() = default;
 
 DemoPreferencesScreenHandler::DemoPreferencesScreenHandler()
     : BaseScreenHandler(kScreenId) {
-  set_user_acted_method_path("login.DemoPreferencesScreen.userActed");
+  set_user_acted_method_path_deprecated(
+      "login.DemoPreferencesScreen.userActed");
 }
 
 DemoPreferencesScreenHandler::~DemoPreferencesScreenHandler() {

diff --git a/chrome/browser/ui/webui/chromeos/login/demo_setup_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/demo_setup_screen_handler.cc
@@ -21,7 +21,7 @@ DemoSetupScreenView::~DemoSetupScreenView() = default;
 
 DemoSetupScreenHandler::DemoSetupScreenHandler()
     : BaseScreenHandler(kScreenId) {
-  set_user_acted_method_path("login.DemoSetupScreen.userActed");
+  set_user_acted_method_path_deprecated("login.DemoSetupScreen.userActed");
 }
 
 DemoSetupScreenHandler::~DemoSetupScreenHandler() {

diff --git a/chrome/browser/ui/webui/chromeos/login/enable_adb_sideloading_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/enable_adb_sideloading_screen_handler.cc
@@ -16,12 +16,8 @@
 
 namespace chromeos {
 
-constexpr StaticOobeScreenId EnableAdbSideloadingScreenView::kScreenId;
-
 EnableAdbSideloadingScreenHandler::EnableAdbSideloadingScreenHandler()
-    : BaseScreenHandler(kScreenId) {
-  set_user_acted_method_path("login.EnableAdbSideloadingScreen.userActed");
-}
+    : BaseScreenHandler(kScreenId) {}
 
 EnableAdbSideloadingScreenHandler::~EnableAdbSideloadingScreenHandler() =
     default;

diff --git a/chrome/browser/ui/webui/chromeos/login/enable_adb_sideloading_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/enable_adb_sideloading_screen_handler.h
@@ -18,7 +18,8 @@ namespace chromeos {
 class EnableAdbSideloadingScreenView
     : public base::SupportsWeakPtr<EnableAdbSideloadingScreenView> {
  public:
-  constexpr static StaticOobeScreenId kScreenId{"adb-sideloading"};
+  inline constexpr static StaticOobeScreenId kScreenId{
+      "adb-sideloading", "EnableAdbSideloadingScreen"};
 
   // The constants need to be synced with oobe_adb_sideloading_screen.js.
   enum class UIState {

diff --git a/chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler.cc
@@ -23,7 +23,8 @@ constexpr StaticOobeScreenId EnableDebuggingScreenView::kScreenId;
 
 EnableDebuggingScreenHandler::EnableDebuggingScreenHandler()
     : BaseScreenHandler(kScreenId) {
-  set_user_acted_method_path("login.EnableDebuggingScreen.userActed");
+  set_user_acted_method_path_deprecated(
+      "login.EnableDebuggingScreen.userActed");
 }
 
 EnableDebuggingScreenHandler::~EnableDebuggingScreenHandler() {

diff --git a/chrome/browser/ui/webui/chromeos/login/encryption_migration_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/encryption_migration_screen_handler.cc
@@ -17,7 +17,8 @@ constexpr StaticOobeScreenId EncryptionMigrationScreenView::kScreenId;
 
 EncryptionMigrationScreenHandler::EncryptionMigrationScreenHandler()
     : BaseScreenHandler(kScreenId) {
-  set_user_acted_method_path("login.EncryptionMigrationScreen.userActed");
+  set_user_acted_method_path_deprecated(
+      "login.EncryptionMigrationScreen.userActed");
 }
 
 EncryptionMigrationScreenHandler::~EncryptionMigrationScreenHandler() {

diff --git a/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.cc
@@ -196,7 +196,8 @@ EnrollmentScreenHandler::EnrollmentScreenHandler(
   DCHECK(network_state_informer_.get());
   DCHECK(error_screen_);
   network_state_informer_->AddObserver(this);
-  set_user_acted_method_path("login.OAuthEnrollmentScreen.userActed");
+  set_user_acted_method_path_deprecated(
+      "login.OAuthEnrollmentScreen.userActed");
 }
 
 EnrollmentScreenHandler::~EnrollmentScreenHandler() {

diff --git a/chrome/browser/ui/webui/chromeos/login/error_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/error_screen_handler.cc
@@ -18,7 +18,7 @@ namespace chromeos {
 constexpr StaticOobeScreenId ErrorScreenView::kScreenId;
 
 ErrorScreenHandler::ErrorScreenHandler() : BaseScreenHandler(kScreenId) {
-  set_user_acted_method_path("login.ErrorMessageScreen.userActed");
+  set_user_acted_method_path_deprecated("login.ErrorMessageScreen.userActed");
 }
 
 ErrorScreenHandler::~ErrorScreenHandler() {

diff --git a/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc
@@ -31,7 +31,7 @@ namespace chromeos {
 constexpr StaticOobeScreenId EulaView::kScreenId;
 
 EulaScreenHandler::EulaScreenHandler() : BaseScreenHandler(kScreenId) {
-  set_user_acted_method_path("login.EulaScreen.userActed");
+  set_user_acted_method_path_deprecated("login.EulaScreen.userActed");
 }
 
 EulaScreenHandler::~EulaScreenHandler() {

diff --git a/chrome/browser/ui/webui/chromeos/login/family_link_notice_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/family_link_notice_screen_handler.cc
@@ -16,7 +16,8 @@ constexpr StaticOobeScreenId FamilyLinkNoticeView::kScreenId;
 
 FamilyLinkNoticeScreenHandler::FamilyLinkNoticeScreenHandler()
     : BaseScreenHandler(kScreenId) {
-  set_user_acted_method_path("login.FamilyLinkNoticeScreen.userActed");
+  set_user_acted_method_path_deprecated(
+      "login.FamilyLinkNoticeScreen.userActed");
 }
 
 FamilyLinkNoticeScreenHandler::~FamilyLinkNoticeScreenHandler() {

diff --git a/chrome/browser/ui/webui/chromeos/login/fingerprint_setup_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/fingerprint_setup_screen_handler.cc
@@ -18,7 +18,8 @@ constexpr StaticOobeScreenId FingerprintSetupScreenView::kScreenId;
 
 FingerprintSetupScreenHandler::FingerprintSetupScreenHandler()
     : BaseScreenHandler(kScreenId) {
-  set_user_acted_method_path("login.FingerprintSetupScreen.userActed");
+  set_user_acted_method_path_deprecated(
+      "login.FingerprintSetupScreen.userActed");
 }
 
 FingerprintSetupScreenHandler::~FingerprintSetupScreenHandler() = default;

diff --git a/chrome/browser/ui/webui/chromeos/login/gaia_password_changed_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/gaia_password_changed_screen_handler.cc
@@ -19,7 +19,8 @@ constexpr StaticOobeScreenId GaiaPasswordChangedView::kScreenId;
 
 GaiaPasswordChangedScreenHandler::GaiaPasswordChangedScreenHandler()
     : BaseScreenHandler(kScreenId) {
-  set_user_acted_method_path("login.GaiaPasswordChangedScreen.userActed");
+  set_user_acted_method_path_deprecated(
+      "login.GaiaPasswordChangedScreen.userActed");
 }
 
 GaiaPasswordChangedScreenHandler::~GaiaPasswordChangedScreenHandler() {

diff --git a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
@@ -326,7 +326,7 @@ GaiaScreenHandler::GaiaScreenHandler(
       network_state_informer_(network_state_informer),
       core_oobe_view_(core_oobe_view) {
   DCHECK(network_state_informer_.get());
-  set_user_acted_method_path("login.GaiaSigninScreen.userActed");
+  set_user_acted_method_path_deprecated("login.GaiaSigninScreen.userActed");
 }
 
 GaiaScreenHandler::~GaiaScreenHandler() {

diff --git a/chrome/browser/ui/webui/chromeos/login/gesture_navigation_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/gesture_navigation_screen_handler.cc
@@ -14,7 +14,8 @@ constexpr StaticOobeScreenId GestureNavigationScreenView::kScreenId;
 
 GestureNavigationScreenHandler::GestureNavigationScreenHandler()
     : BaseScreenHandler(kScreenId) {
-  set_user_acted_method_path("login.GestureNavigationScreen.userActed");
+  set_user_acted_method_path_deprecated(
+      "login.GestureNavigationScreen.userActed");
 }
 
 GestureNavigationScreenHandler::~GestureNavigationScreenHandler() = default;

diff --git a/chrome/browser/ui/webui/chromeos/login/guest_tos_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/guest_tos_screen_handler.cc
@@ -14,7 +14,7 @@ namespace chromeos {
 constexpr StaticOobeScreenId GuestTosScreenView::kScreenId;
 
 GuestTosScreenHandler::GuestTosScreenHandler() : BaseScreenHandler(kScreenId) {
-  set_user_acted_method_path("login.GuestTosScreen.userActed");
+  set_user_acted_method_path_deprecated("login.GuestTosScreen.userActed");
 }
 
 GuestTosScreenHandler::~GuestTosScreenHandler() {

diff --git a/chrome/browser/ui/webui/chromeos/login/hardware_data_collection_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/hardware_data_collection_screen_handler.cc
@@ -18,7 +18,8 @@ constexpr StaticOobeScreenId HWDataCollectionView::kScreenId;
 
 HWDataCollectionScreenHandler::HWDataCollectionScreenHandler()
     : BaseScreenHandler(kScreenId) {
-  set_user_acted_method_path("login.HWDataCollectionScreen.userActed");
+  set_user_acted_method_path_deprecated(
+      "login.HWDataCollectionScreen.userActed");
 }
 
 HWDataCollectionScreenHandler::~HWDataCollectionScreenHandler() {

diff --git a/chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.cc
@@ -23,7 +23,7 @@ constexpr StaticOobeScreenId HIDDetectionView::kScreenId;
 
 HIDDetectionScreenHandler::HIDDetectionScreenHandler()
     : BaseScreenHandler(kScreenId) {
-  set_user_acted_method_path("login.HIDDetectionScreen.userActed");
+  set_user_acted_method_path_deprecated("login.HIDDetectionScreen.userActed");
 }
 
 HIDDetectionScreenHandler::~HIDDetectionScreenHandler() {

diff --git a/chrome/browser/ui/webui/chromeos/login/kiosk_enable_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/kiosk_enable_screen_handler.cc
@@ -21,7 +21,7 @@ constexpr StaticOobeScreenId KioskEnableScreenView::kScreenId;
 
 KioskEnableScreenHandler::KioskEnableScreenHandler()
     : BaseScreenHandler(kScreenId) {
-  set_user_acted_method_path("login.KioskEnableScreen.userActed");
+  set_user_acted_method_path_deprecated("login.KioskEnableScreen.userActed");
 }
 
 KioskEnableScreenHandler::~KioskEnableScreenHandler() {

diff --git a/chrome/browser/ui/webui/chromeos/login/lacros_data_migration_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/lacros_data_migration_screen_handler.cc
@@ -16,7 +16,8 @@ constexpr StaticOobeScreenId LacrosDataMigrationScreenView::kScreenId;
 
 LacrosDataMigrationScreenHandler::LacrosDataMigrationScreenHandler()
     : BaseScreenHandler(kScreenId) {
-  set_user_acted_method_path("login.LacrosDataMigrationScreen.userActed");
+  set_user_acted_method_path_deprecated(
+      "login.LacrosDataMigrationScreen.userActed");
 }
 
 LacrosDataMigrationScreenHandler::~LacrosDataMigrationScreenHandler() {

diff --git a/chrome/browser/ui/webui/chromeos/login/multidevice_setup_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/multidevice_setup_screen_handler.cc
@@ -16,7 +16,8 @@ constexpr StaticOobeScreenId MultiDeviceSetupScreenView::kScreenId;
 
 MultiDeviceSetupScreenHandler::MultiDeviceSetupScreenHandler()
     : BaseScreenHandler(kScreenId) {
-  set_user_acted_method_path("login.MultiDeviceSetupScreen.userActed");
+  set_user_acted_method_path_deprecated(
+      "login.MultiDeviceSetupScreen.userActed");
 }
 
 MultiDeviceSetupScreenHandler::~MultiDeviceSetupScreenHandler() = default;

diff --git a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc
@@ -22,7 +22,7 @@ namespace chromeos {
 constexpr StaticOobeScreenId NetworkScreenView::kScreenId;
 
 NetworkScreenHandler::NetworkScreenHandler() : BaseScreenHandler(kScreenId) {
-  set_user_acted_method_path("login.NetworkScreen.userActed");
+  set_user_acted_method_path_deprecated("login.NetworkScreen.userActed");
 }
 
 NetworkScreenHandler::~NetworkScreenHandler() {

diff --git a/chrome/browser/ui/webui/chromeos/login/offline_login_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/offline_login_screen_handler.cc
@@ -17,7 +17,7 @@ constexpr StaticOobeScreenId OfflineLoginView::kScreenId;
 
 OfflineLoginScreenHandler::OfflineLoginScreenHandler()
     : BaseScreenHandler(kScreenId) {
-  set_user_acted_method_path("login.OfflineLoginScreen.userActed");
+  set_user_acted_method_path_deprecated("login.OfflineLoginScreen.userActed");
 }
 
 OfflineLoginScreenHandler::~OfflineLoginScreenHandler() {

diff --git a/chrome/browser/ui/webui/chromeos/login/os_install_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/os_install_screen_handler.cc
@@ -30,7 +30,7 @@ constexpr StaticOobeScreenId OsInstallScreenView::kScreenId;
 
 OsInstallScreenHandler::OsInstallScreenHandler()
     : BaseScreenHandler(kScreenId) {
-  set_user_acted_method_path("login.OsInstallScreen.userActed");
+  set_user_acted_method_path_deprecated("login.OsInstallScreen.userActed");
 }
 
 OsInstallScreenHandler::~OsInstallScreenHandler() {

diff --git a/chrome/browser/ui/webui/chromeos/login/os_trial_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/os_trial_screen_handler.cc
@@ -16,7 +16,7 @@ namespace chromeos {
 constexpr StaticOobeScreenId OsTrialScreenView::kScreenId;
 
 OsTrialScreenHandler::OsTrialScreenHandler() : BaseScreenHandler(kScreenId) {
-  set_user_acted_method_path("login.OsTrialScreen.userActed");
+  set_user_acted_method_path_deprecated("login.OsTrialScreen.userActed");
 }
 
 OsTrialScreenHandler::~OsTrialScreenHandler() {

diff --git a/chrome/browser/ui/webui/chromeos/login/packaged_license_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/packaged_license_screen_handler.cc
@@ -14,7 +14,8 @@ constexpr StaticOobeScreenId PackagedLicenseView::kScreenId;
 
 PackagedLicenseScreenHandler::PackagedLicenseScreenHandler()
     : BaseScreenHandler(kScreenId) {
-  set_user_acted_method_path("login.PackagedLicenseScreen.userActed");
+  set_user_acted_method_path_deprecated(
+      "login.PackagedLicenseScreen.userActed");
 }
 
 PackagedLicenseScreenHandler::~PackagedLicenseScreenHandler() {}

diff --git a/chrome/browser/ui/webui/chromeos/login/parental_handoff_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/parental_handoff_screen_handler.cc
@@ -23,7 +23,8 @@ constexpr StaticOobeScreenId ParentalHandoffScreenView::kScreenId;
 
 ParentalHandoffScreenHandler::ParentalHandoffScreenHandler()
     : BaseScreenHandler(kScreenId) {
-  set_user_acted_method_path("login.ParentalHandoffScreen.userActed");
+  set_user_acted_method_path_deprecated(
+      "login.ParentalHandoffScreen.userActed");
 }
 
 ParentalHandoffScreenHandler::~ParentalHandoffScreenHandler() {

diff --git a/chrome/browser/ui/webui/chromeos/login/pin_setup_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/pin_setup_screen_handler.cc
@@ -16,7 +16,7 @@ namespace chromeos {
 constexpr StaticOobeScreenId PinSetupScreenView::kScreenId;
 
 PinSetupScreenHandler::PinSetupScreenHandler() : BaseScreenHandler(kScreenId) {
-  set_user_acted_method_path("login.PinSetupScreen.userActed");
+  set_user_acted_method_path_deprecated("login.PinSetupScreen.userActed");
 }
 
 PinSetupScreenHandler::~PinSetupScreenHandler() {}

diff --git a/chrome/browser/ui/webui/chromeos/login/quick_start_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/quick_start_screen_handler.cc
@@ -13,7 +13,7 @@ constexpr StaticOobeScreenId QuickStartView::kScreenId;
 
 QuickStartScreenHandler::QuickStartScreenHandler()
     : BaseScreenHandler(kScreenId) {
-  set_user_acted_method_path("login.QuickStartScreen.userActed");
+  set_user_acted_method_path_deprecated("login.QuickStartScreen.userActed");
 }
 
 QuickStartScreenHandler::~QuickStartScreenHandler() {