[Nearby] Reland: Strings updates on contact visibility page.

The original change was reverted because one of the sha files was
actually a png file. This fix changes the contents of that file to an
actual sha.

Revert is here:
  https://chromium-review.googlesource.com/c/chromium/src/+/2514420

Original change is here:
  https://chromium-review.googlesource.com/c/chromium/src/+/2511852

Original change's description:
> Removes the "Contacts" title and updates strings in the description
> for each visibility mode to match the latest specs.
>
> Screenshots:
>   https://screenshot.googleplex.com/An6Ta8EDzfS3KZU.png
>   https://screenshot.googleplex.com/C5WwqifMeCnLhkH.png
>   https://screenshot.googleplex.com/C48HQVfgouJrhHF.png
>
> Strings spec:
>   https://docs.google.com/document/d/1s-KjC1mM4ZPYeYAO7oI8lXltS_1FaYYfMMnNDdbfRag

Bug: b:168841167
Change-Id: I487d7d4614e6cfa8971fab3c7e5ee39c552ab4cb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2514178Reviewed-by: James Vecore <vecore@google.com>
Commit-Queue: Michael Hansen <hansenmichael@google.com>
Cr-Commit-Position: refs/heads/master@{#823284}

chrome/app/nearby_share_strings.grdp

@@ -13,15 +13,6 @@
   </message>
 
   <!-- Contact visibility component -->
-  <message name="IDS_NEARBY_CONTACT_VISIBILITY_CONTACTS_TITLE" desc="Section title of the contacts list when setting up the device visibility for the Nearby Share feature.">
-    Contacts
-  </message>
-  <message name="IDS_NEARBY_CONTACT_VISIBILITY_NEARBY_SHARE_OPEN_OTHERS" desc="Describes that nearby devices are visible while the Nearby Share feature is open on their screen.">
-    Devices near you when Nearby Share is open on their device
-  </message>
-  <message name="IDS_NEARBY_CONTACT_VISIBILITY_NEARBY_SHARE_OPEN_OWN" desc="Describes that the local device is visible to nearby devices while the Nearby Share feature is open on screen on the local device.">
-    Devices near you when Nearby Share is open on your device
-  </message>
   <message name="IDS_NEARBY_CONTACT_VISIBILITY_NO_CONTACTS_SUBTITLE" desc="Help text shown when there are no available contacts with a Google Account to select from. Nearby Share is the feature name.">
     No contacts are available. To use Nearby Share with your contacts, add the email address linked with their Google Account to your contacts.
   </message>
@@ -29,19 +20,19 @@
     No available contacts
   </message>
   <message name="IDS_NEARBY_CONTACT_VISIBILITY_OTHERS" desc="Describes when nearby devices are visible to this user when using the Nearby Share feature.">
-    People who have chosen to be visible to you when their screen is unlocked
+    People who have chosen to be visible to you when their screen is unlocked and devices near you when Nearby Share is open
   </message>
   <message name="IDS_NEARBY_CONTACT_VISIBILITY_OTHERS_TITLE" desc="Title of the description for which devices the user can share with using the Nearby Share feature.">
     Devices you can share with
   </message>
   <message name="IDS_NEARBY_CONTACT_VISIBILITY_OWN_ALL" desc="Describes who can see the local device when the Nearby Share visibility setting is set to 'All contacts'.">
-    All contacts near you when your screen is unlocked
+    All contacts near you when your screen is unlocked and devices near you when Nearby Share is open
   </message>
   <message name="IDS_NEARBY_CONTACT_VISIBILITY_OWN_NONE" desc="Describes who can see the local device when the Nearby Share visibility setting is set to 'Hidden'.">
-    No one unless you open Nearby Share on your device
+    No one unless you open Nearby Share
   </message>
   <message name="IDS_NEARBY_CONTACT_VISIBILITY_OWN_SOME" desc="Describes who can see the local device when the Nearby Share visibility setting is set to 'Some contacts'.">
-    Selected contacts near you when your screen is unlocked
+    Selected contacts near you when your screen is unlocked and devices near you when Nearby Share is open
   </message>
   <message name="IDS_NEARBY_CONTACT_VISIBILITY_OWN_TITLE" desc="Title of the description for which nearby devices can share with a users device using the Nearby Share feature.">
     Who can share with your device

chrome/app/nearby_share_strings_grdp/IDS_NEARBY_CONTACT_VISIBILITY_CONTACTS_TITLE.png.sha1

-f03656b6855a546c2eb9d591add1189c1288816a
\ No newline at end of file

chrome/app/nearby_share_strings_grdp/IDS_NEARBY_CONTACT_VISIBILITY_NEARBY_SHARE_OPEN_OTHERS.png.sha1

-3ac199f7e641f8ca94e14e0862696eb6b906ff01
\ No newline at end of file

chrome/app/nearby_share_strings_grdp/IDS_NEARBY_CONTACT_VISIBILITY_NEARBY_SHARE_OPEN_OWN.png.sha1

-e7c2d3890a48f879296229a8cc9d37b7847ad485
\ No newline at end of file

chrome/app/nearby_share_strings_grdp/IDS_NEARBY_CONTACT_VISIBILITY_OTHERS.png.sha1

-82dd80089245c617004a672c5a1d711f0af69cf2
+0d92a01cc9e8496c886d644b5d73292ce4410f03
\ No newline at end of file

chrome/app/nearby_share_strings_grdp/IDS_NEARBY_CONTACT_VISIBILITY_OWN_ALL.png.sha1

-63c28557a5a35614729b9e09d56172aa3c35881e
+d5f3b900906959a1a4ba281fd09cdfdda5da0856
\ No newline at end of file

chrome/app/nearby_share_strings_grdp/IDS_NEARBY_CONTACT_VISIBILITY_OWN_NONE.png.sha1

-f3218f0c0ad070413de224e4fb271b5d922e08f5
+0d92a01cc9e8496c886d644b5d73292ce4410f03
\ No newline at end of file

chrome/app/nearby_share_strings_grdp/IDS_NEARBY_CONTACT_VISIBILITY_OWN_SOME.png.sha1

-d43ef5c857b9b4d512ced44519a2e90f3e326318
+1ef5d39d3c450ec66d3b60c7b8d3ae2fcb38fec1
\ No newline at end of file

chrome/browser/resources/nearby_share/shared/nearby_contact_visibility.html

@@ -114,12 +114,6 @@
         margin-block-end: 8px;
       }
 
-      .explanation-list {
-        list-style: none;
-        margin: 0;
-        padding: 0;
-      }
-
       .explanation-section {
         display: flex;
         margin-block-end: 8px;
@@ -242,12 +236,7 @@
                 $i18n{nearbyShareContactVisibilityOthersTitle}
               </div>
               <div class="cr-secondary-text">
-                <ul class="explanation-list">
-                  <li>$i18n{nearbyShareContactVisibilityOthers}</li>
-                  <li>
-                    $i18n{nearbyShareContactVisibilityNearbyShareOpenOthers}
-                  </li>
-                </ul>
+                $i18n{nearbyShareContactVisibilityOthers}
               </div>
             </div>
           </div>
@@ -262,31 +251,19 @@
               <template is="dom-if"
                   if="[[isVisibility_(selectedVisibility,'all')]]">
                 <div class="cr-secondary-text">
-                  <ul class="explanation-list">
-                    <li>$i18n{nearbyShareContactVisibilityOwnAll}</li>
-                    <li>
-                      $i18n{nearbyShareContactVisibilityNearbyShareOpenOwn}
-                    </li>
-                  </ul>
+                  $i18n{nearbyShareContactVisibilityOwnAll}
                 </div>
               </template>
               <template is="dom-if"
                   if="[[isVisibility_(selectedVisibility,'some')]]">
                 <div class="cr-secondary-text">
-                  <ul class="explanation-list">
-                    <li>$i18n{nearbyShareContactVisibilityOwnSome}</li>
-                    <li>
-                      $i18n{nearbyShareContactVisibilityNearbyShareOpenOwn}
-                    </li>
-                  </ul>
+                  $i18n{nearbyShareContactVisibilityOwnSome}
                 </div>
               </template>
               <template is="dom-if"
                   if="[[isVisibility_(selectedVisibility,'none')]]">
                 <div class="cr-secondary-text">
-                  <ul class="explanation-list">
-                    <li>$i18n{nearbyShareContactVisibilityOwnNone}</li>
-                  </ul>
+                  $i18n{nearbyShareContactVisibilityOwnNone}
                 </div>
               </template>
             </div>
@@ -295,10 +272,6 @@
         </div>
 
         <div id="contactsWrapper">
-          <div id="contactsHeading">
-            $i18n{nearbyShareContactVisibilityContactsTitle}
-          </div>
-
           <!-- Show when the user has one or more contacts downloaded. -->
           <template is="dom-if" if="[[inContactsState_(contactsState,
                                       ContactsState.HAS_CONTACTS)]]">

chrome/browser/ui/webui/nearby_share/shared_resources.cc

@@ -91,12 +91,6 @@ void RegisterNearbySharedStrings(content::WebUIDataSource* data_source) {
       {"nearbyShareContactVisibilityAll", IDS_NEARBY_VISIBLITY_ALL_CONTACTS},
       {"nearbyShareContactVisibilityAllDescription",
        IDS_NEARBY_VISIBLITY_ALL_CONTACTS_DESCRIPTION},
-      {"nearbyShareContactVisibilityContactsTitle",
-       IDS_NEARBY_CONTACT_VISIBILITY_CONTACTS_TITLE},
-      {"nearbyShareContactVisibilityNearbyShareOpenOthers",
-       IDS_NEARBY_CONTACT_VISIBILITY_NEARBY_SHARE_OPEN_OTHERS},
-      {"nearbyShareContactVisibilityNearbyShareOpenOwn",
-       IDS_NEARBY_CONTACT_VISIBILITY_NEARBY_SHARE_OPEN_OWN},
       {"nearbyShareContactVisibilityNoContactsSubtitle",
        IDS_NEARBY_CONTACT_VISIBILITY_NO_CONTACTS_SUBTITLE},
       {"nearbyShareContactVisibilityNoContactsTitle",