Settings WebUI: Remove two-line/three-line classes on Sync page

Bug: 686905
Change-Id: I6f9a55492b7f6cd02be0fda7e9c4110fed2cb4f7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2333289
Commit-Queue: John Lee <johntlee@chromium.org>
Reviewed-by: dpapad <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#794694}

chrome/browser/resources/settings/people_page/sync_page.html

@@ -72,10 +72,6 @@
         padding-bottom: 8px;
       }
 
-      #other-sync-items > .list-item:not(.first) {
-        border-top: var(--cr-separator-line);
-      }
-
       .passphrase-reset-icon {
         margin-inline-end: 8px;
       }
@@ -179,9 +175,7 @@
           <template is="dom-if" if="[[!syncSetupFriendlySettings_]]">
             <div id="encryptionDescription"
                 hidden="[[syncPrefs.passphraseRequired]]"
-                class$="single-column cr-padded-text
-                    [[getPassphraseHintLines_(syncPrefs.encryptAllData)]]
-                    list-item">
+                class="hr cr-padded-text">
               $i18n{encryptionOptionsTitle}
               <div class="secondary">
                 $i18n{syncDataEncryptedText}
@@ -204,8 +198,7 @@
             <cr-expand-button id="encryptionDescription"
                 hidden="[[syncPrefs.passphraseRequired]]"
                 expanded="{{encryptionExpanded_}}"
-                class$="list-item
-                    [[getPassphraseHintLines_(syncPrefs.encryptAllData)]]">
+                class="hr">
               $i18n{encryptionOptionsTitle}
               <div class="secondary">
                 $i18n{syncDataEncryptedText}

chrome/browser/resources/settings/people_page/sync_page.js

@@ -516,16 +516,6 @@ Polymer({
     }
   },
 
-  /**
-   * When there is a sync passphrase, some items have an additional line for the
-   * passphrase reset hint, making them three lines rather than two.
-   * @return {string}
-   * @private
-   */
-  getPassphraseHintLines_() {
-    return this.syncPrefs.encryptAllData ? 'three-line' : 'two-line';
-  },
-
   /**
    * @return {boolean}
    * @private

chrome/test/data/webui/settings/people_page_sync_page_test.js

@@ -137,7 +137,8 @@ suite('SyncSettingsTests', function() {
     assertFalse(syncSection.hidden);
     assertTrue(syncPage.$$('#sync-separator').hidden);
     assertTrue(otherItems.classList.contains('list-frame'));
-    assertEquals(otherItems.querySelectorAll(':scope > .list-item').length, 1);
+    assertEquals(
+        otherItems.querySelectorAll(':scope > cr-expand-button').length, 1);
     assertEquals(otherItems.querySelectorAll(':scope > cr-link-row').length, 3);
 
     // Test sync paused state.