Adjust EOL texts for FlexOrgs

Adjust the domain placeholder names, descriptions and screenshots in
IDS_SETTINGS_UPDATE_REQUIRED_EOL_BANNER_ONE_WEEK and
IDS_SETTINGS_UPDATE_REQUIRED_EOL_BANNER_DAYS to prepare them for
FlexOrgs and make it easier for the translators to understand the usage
of the texts.

Additionally replace calls to
BrowserPolicyConnectorChromeOS::GetEnterpriseDisplayDomain with calls to
BrowserPolicyConnectorChromeOS::GetEnterpriseDomainManager.

Bug: b:172683940, b:172683948
Test: Manual
Change-Id: I1102446a9d065638a8dd008a751340f6abb6060c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2571878Reviewed-by: Brian Malcolm <bmalcolm@chromium.org>
Reviewed-by: James Cook <jamescook@chromium.org>
Commit-Queue: Jana Grill <janagrill@chromium.org>
Cr-Commit-Position: refs/heads/master@{#834177}

chrome/app/os_settings_strings.grdp

@@ -18,13 +18,13 @@
   <message name="IDS_SETTINGS_SECONDARY_USER_BANNER" desc="Banner displayed in settings page when the user is secondary in a multi-profile session.">
     Some settings belonging to <ph name="PRIMARY_EMAIL">$1<ex>john@google.com</ex></ph> are being shared with you. These settings only affect your account when using multiple sign-in.
   </message>
-  <message name="IDS_SETTINGS_UPDATE_REQUIRED_EOL_BANNER_DAYS" desc="Banner displayed in OS settings page in case update is required by policy but device has reached end-of-life and the days remaining to return the device back to the enterprise is less than seven.">
+  <message name="IDS_SETTINGS_UPDATE_REQUIRED_EOL_BANNER_DAYS" desc="Banner displayed in OS settings page in case update is required by policy, but the device has reached end-of-life and the number of days remaining to return the device back to the manager is less than seven. MANAGER can be a domain or an email address.">
     {NUM_DAYS, plural,
-      =1 {<ph name="DOMAIN">{1}<ex>example.com</ex></ph> requires you to back up your data and return this <ph name="DEVICE_TYPE">{2}<ex>Chromebook</ex></ph> today.<ph name="LINK_BEGIN">&lt;a target="_blank" href="{3}<ex>https://google.com/</ex>"&gt;</ph>See details<ph name="LINK_END">&lt;/a&gt;</ph>}
-      other {<ph name="DOMAIN">{1}<ex>example.com</ex></ph> requires you to back up your data and return this <ph name="DEVICE_TYPE">{2}<ex>Chromebook</ex></ph> within {NUM_DAYS} days.<ph name="LINK_BEGIN">&lt;a target="_blank" href="{3}<ex>https://google.com/</ex>"&gt;</ph>See details<ph name="LINK_END">&lt;/a&gt;</ph>}}
+      =1 {<ph name="MANAGER">{1}<ex>example.com</ex></ph> requires you to back up your data and return this <ph name="DEVICE_TYPE">{2}<ex>Chromebook</ex></ph> today.<ph name="LINK_BEGIN">&lt;a target="_blank" href="{3}<ex>https://google.com/</ex>"&gt;</ph>See details<ph name="LINK_END">&lt;/a&gt;</ph>}
+      other {<ph name="MANAGER">{1}<ex>example.com</ex></ph> requires you to back up your data and return this <ph name="DEVICE_TYPE">{2}<ex>Chromebook</ex></ph> within {NUM_DAYS} days.<ph name="LINK_BEGIN">&lt;a target="_blank" href="{3}<ex>https://google.com/</ex>"&gt;</ph>See details<ph name="LINK_END">&lt;/a&gt;</ph>}}
   </message>
-  <message name="IDS_SETTINGS_UPDATE_REQUIRED_EOL_BANNER_ONE_WEEK" desc="Banner displayed in OS settings page in case update is required by policy but device has reached end-of-life and the days remaining to return the device back to the enterprise is equal to seven.">
-    <ph name="DOMAIN">$1<ex>example.com</ex></ph> requires you to back up your data and return this <ph name="DEVICE_TYPE">$2<ex>Chromebook</ex></ph> within 1 week.<ph name="LINK_BEGIN">&lt;a target="_blank" href="$3<ex>https://google.com/</ex>"&gt;</ph>See details<ph name="LINK_END">&lt;/a&gt;</ph>
+  <message name="IDS_SETTINGS_UPDATE_REQUIRED_EOL_BANNER_ONE_WEEK" desc="Banner displayed in OS settings page in case update is required by policy, but the device has reached end-of-life and the number of days remaining to return the device back to the manager is equal to seven. MANAGER can be a domain or an email address.">
+    <ph name="MANAGER">$1<ex>example.com</ex></ph> requires you to back up your data and return this <ph name="DEVICE_TYPE">$2<ex>Chromebook</ex></ph> within 1 week.<ph name="LINK_BEGIN">&lt;a target="_blank" href="$3<ex>https://google.com/</ex>"&gt;</ph>See details<ph name="LINK_END">&lt;/a&gt;</ph>
   </message>
 
   <!-- Settings Search Box -->

chrome/app/os_settings_strings_grdp/IDS_SETTINGS_UPDATE_REQUIRED_EOL_BANNER_DAYS.png.sha1

-7fb20039ee560a2011c23caa90be95ad49cb8a2a
+ac20dd522d48d3b3ec5595bb7ec9875856d36d7b
\ No newline at end of file

chrome/app/os_settings_strings_grdp/IDS_SETTINGS_UPDATE_REQUIRED_EOL_BANNER_ONE_WEEK.png.sha1

-9e08260e0f4b0af62a9b344a5584615126caac3d
+ac20dd522d48d3b3ec5595bb7ec9875856d36d7b
\ No newline at end of file

chrome/browser/ui/webui/settings/chromeos/main_section.cc

@@ -79,7 +79,7 @@ void AddUpdateRequiredEolStrings(content::WebUIDataSource* html_source) {
       // deadline.
       int days_remaining = days.value() ? days.value() : 1;
       base::string16 domain_name =
-          base::UTF8ToUTF16(connector->GetEnterpriseDisplayDomain());
+          base::UTF8ToUTF16(connector->GetEnterpriseDomainManager());
       base::string16 link_url =
           base::UTF8ToUTF16(chrome::kChromeUIManagementURL);
       if (days_remaining == 7) {
@@ -92,7 +92,7 @@ void AddUpdateRequiredEolStrings(content::WebUIDataSource* html_source) {
                 l10n_util::GetStringUTF16(
                     IDS_SETTINGS_UPDATE_REQUIRED_EOL_BANNER_DAYS),
                 days_remaining,
-                base::UTF8ToUTF16(connector->GetEnterpriseDisplayDomain()),
+                base::UTF8ToUTF16(connector->GetEnterpriseDomainManager()),
                 ui::GetChromeOSDeviceName(),
                 base::UTF8ToUTF16(chrome::kChromeUIManagementURL));
       }