[MD settings] fix layout in startup urls and search engines iron-lists

chrome/browser/resources/settings/on_startup_page/startup_urls_page.html

 <link rel="import" href="chrome://resources/html/polymer.html">
 
 <link rel="import" href="chrome://resources/html/action_link.html">
 <link rel="import" href="chrome://resources/html/action_link_css.html">
 <link rel="import" href="chrome://resources/html/assert.html">
 <link rel="import" href="chrome://resources/html/cr/ui/focus_without_ink.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout-classes.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-list/iron-list.html">
 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
 <link rel="import" href="chrome://resources/cr_elements/cr_scrollable_behavior.html">
 <link rel="import" href="../controls/extension_controlled_indicator.html">
 <link rel="import" href="../settings_shared_css.html">
 <link rel="import" href="startup_url_dialog.html">
 <link rel="import" href="startup_url_entry.html">
 <link rel="import" href="startup_urls_page_browser_proxy.html">
 
 <dom-module id="settings-startup-urls-page">
   <template>
     <style include="settings-shared action-link iron-flex">
-      #outer {
+      #container {
         @apply(--settings-list-frame-padding);
-        max-height: 395px;  /** Enough height to show six entries. */
-      }
-
-      #container iron-list > settings-startup-url-entry:not(:first-of-type) {
-        border-top: var(--settings-separator-line);
+        /* Show up to six rows before limiting the height and using a scroll
+         * bar. */
+        max-height: calc((var(--settings-row-two-line-min-height) +
+                          var(--settings-separator-height)) * 6);
       }
 
       #container settings-startup-url-entry {
+        border-bottom: var(--settings-separator-line);
         cursor: default;
       }
     </style>
-    <div id="outer" class="layout vertical flex vertical-list">
-      <div id="container" class="scroll-container" scrollable>
-        <iron-list items="[[startupPages_]]" scroll-target="container">
-          <template>
-            <settings-startup-url-entry model="[[item]]"
-                tabindex$="[[tabIndex]]" iron-list-tab-index="[[tabIndex]]"
-                last-focused="{{lastFocused_}}"
-                editable="[[!prefs.session.startup_urls.controlledBy]]">
-            </settings-startup-url-entry>
-          </template>
-        </iron-list>
-      </div>
+    <div id="container" class="scroll-container" scrollable>
+      <iron-list items="[[startupPages_]]" scroll-target="container">
+        <template>
+          <settings-startup-url-entry model="[[item]]"
+              tabindex$="[[tabIndex]]" iron-list-tab-index="[[tabIndex]]"
+              last-focused="{{lastFocused_}}"
+              editable="[[!prefs.session.startup_urls.controlledBy]]">
+          </settings-startup-url-entry>
+        </template>
+      </iron-list>
+    </div>
+    <div class="list-frame vertical-list">
       <template is="dom-if" if="[[!prefs.session.startup_urls.controlledBy]]"
           restamp>
         <div class="list-item" id="addPage">
           <a is="action-link" class="list-button" on-tap="onAddPageTap_">
             $i18n{onStartupAddNewPage}
           </a>
         </div>
         <div class="list-item" id="useCurrentPages">
           <a is="action-link" class="list-button"
               on-tap="onUseCurrentPagesTap_">
@@ skipping 12 matching lines @@
       </template>
     </div>
     <template is="dom-if" if="[[showStartupUrlDialog_]]" restamp>
       <settings-startup-url-dialog model="[[startupUrlDialogModel_]]"
           on-close="destroyUrlDialog_">
       </settings-startup-url-dialog>
     </template>
   </template>
   <script src="startup_urls_page.js"></script>
 </dom-module>