[CrOS] OOBE: Show device type on powerwash dialog

Currently the dialog refers to the device as "Chrome device" instead
of "Chromebook/Chromebox/etc". This commit fixes it in three messages.

R=rsorokin@google.com
Signed-off-by: Guido Trotter <ultrotter@chromium.org>
Fixed: 1023388
Change-Id: I9f4e300587fc978e00e782f99031d55844786f54
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2518854Reviewed-by: Roman Sorokin [CET] <rsorokin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#824382}

chrome/app/chromeos_strings.grdp

@@ -2294,13 +2294,13 @@
     OK
   </message>
   <message name="IDS_RESET_SCREEN_WARNING_MSG" desc="Warning text shown on reset screen above the exclamation icon.">
-    Reset this <ph name="IDS_SHORT_PRODUCT_NAME">$1<ex>Chrome</ex></ph> device
+    Reset this <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph>
   </message>
   <message name="IDS_RESET_SCREEN_WARNING_POWERWASH_MSG" desc="Warning text shown on reset screen below the exclamation icon.">
-    Powerwash to reset your <ph name="IDS_SHORT_PRODUCT_NAME">$1<ex>Chrome</ex></ph> device to be just like new.
+    Powerwash to reset your <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph> to be just like new.
   </message>
   <message name="IDS_RESET_SCREEN_WARNING_POWERWASH_AND_ROLLBACK_MSG" desc="Warning text shown on reset screen below the exclamation icon.">
-    Powerwash your <ph name="IDS_SHORT_PRODUCT_NAME">$1<ex>Chrome</ex></ph> device and return to the previous version.
+    Powerwash your <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph> and return to the previous version.
   </message>
   <message name="IDS_RESET_SCREEN_WARNING_DETAILS_DATA" desc="Additional warning text shown on reset screen below the main warning.">
     All user accounts and local data will be removed.

chrome/app/chromeos_strings_grdp/IDS_RESET_SCREEN_WARNING_MSG.png.sha1

+b79be5d034f818ee5820570a7793f5ce64bf3880
\ No newline at end of file

chrome/app/chromeos_strings_grdp/IDS_RESET_SCREEN_WARNING_POWERWASH_AND_ROLLBACK_MSG.png.sha1

+b9d1dbfc212f8d95f73e8f76f82db1029647cf65
\ No newline at end of file

chrome/app/chromeos_strings_grdp/IDS_RESET_SCREEN_WARNING_POWERWASH_MSG.png.sha1

+b79be5d034f818ee5820570a7793f5ce64bf3880
\ No newline at end of file

chrome/browser/ui/webui/chromeos/login/reset_screen_handler.cc

@@ -16,6 +16,7 @@
 #include "chromeos/dbus/session_manager/session_manager_client.h"
 #include "components/login/localized_values_builder.h"
 #include "components/strings/grit/components_strings.h"
+#include "ui/chromeos/devicetype_utils.h"
 
 namespace chromeos {
 
@@ -79,17 +80,16 @@ void ResetScreenHandler::DeclareLocalizedValues(
                IDS_RESET_SCREEN_TPM_FIRMWARE_UPDATE_OPTION);
 
   // Variants for screen title.
-  builder->AddF("resetWarningTitle",
-                IDS_RESET_SCREEN_WARNING_MSG,
-                IDS_SHORT_PRODUCT_NAME);
+  builder->AddF("resetWarningTitle", IDS_RESET_SCREEN_WARNING_MSG,
+                ui::GetChromeOSDeviceName());
 
   // Variants for screen message.
   builder->AddF("resetPowerwashWarningDetails",
                 IDS_RESET_SCREEN_WARNING_POWERWASH_MSG,
-                IDS_SHORT_PRODUCT_NAME);
+                ui::GetChromeOSDeviceName());
   builder->AddF("resetPowerwashRollbackWarningDetails",
                 IDS_RESET_SCREEN_WARNING_POWERWASH_AND_ROLLBACK_MSG,
-                IDS_SHORT_PRODUCT_NAME);
+                ui::GetChromeOSDeviceName());
 
   builder->Add("confirmPowerwashTitle", IDS_RESET_SCREEN_POPUP_POWERWASH_TITLE);
   builder->Add("confirmRollbackTitle", IDS_RESET_SCREEN_POPUP_ROLLBACK_TITLE);