[MD settings] tweaks to what is shown in about page; and css cleanup

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

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 cr.define('settings_about_page', function() {
   /**
    * @constructor
    * @implements {settings.AboutPageBrowserProxy}
    * @extends {settings.TestBrowserProxy}
    */
@@ skipping 291 matching lines @@
 
           fireStatusChanged(UpdateStatus.UPDATED);
           assertEquals(null, icon.src);
           assertEquals('settings:error', icon.icon);
           assertFalse(page.$.deprecationWarning.hidden);
           assertTrue(page.$.updateStatusMessage.hidden);
         });
       });
 
       test('Relaunch', function() {
+        var relaunchContainer = page.$.relaunchContainer;
+        assertTrue(!!relaunchContainer);
+        assertTrue(relaunchContainer.hidden);
+
+        fireStatusChanged(UpdateStatus.NEARLY_UPDATED);
+        assertFalse(relaunchContainer.hidden);
+
         var relaunch = page.$.relaunch;
         assertTrue(!!relaunch);
-        assertTrue(relaunch.hidden);
-
-        fireStatusChanged(UpdateStatus.NEARLY_UPDATED);
-        assertFalse(relaunch.hidden);
-
         MockInteractions.tap(relaunch);
         return lifetimeBrowserProxy.whenCalled('relaunch');
       });
 
       if (cr.isChromeOS) {
         /**
          * Test that all buttons update according to incoming
          * 'update-status-changed' events for the case where target and current
          * channel are the same.
          */
         test('ButtonsUpdate_SameChannel', function() {
-          var relaunch = page.$.relaunch;
+          var relaunchContainer = page.$.relaunchContainer;
           var checkForUpdates = page.$.checkForUpdates;
           var relaunchAndPowerwash = page.$.relaunchAndPowerwash;
 
-          assertTrue(!!relaunch);
+          assertTrue(!!relaunchContainer);
           assertTrue(!!relaunchAndPowerwash);
           assertTrue(!!checkForUpdates);
 
           function assertAllHidden() {
             assertTrue(checkForUpdates.hidden);
-            assertTrue(relaunch.hidden);
+            assertTrue(relaunchContainer.hidden);
             assertTrue(relaunchAndPowerwash.hidden);
           }
 
           // Check that |UPDATED| status is ignored if the user has not
           // explicitly checked for updates yet.
           fireStatusChanged(UpdateStatus.UPDATED);
           assertFalse(checkForUpdates.hidden);
-          assertTrue(relaunch.hidden);
+          assertTrue(relaunchContainer.hidden);
           assertTrue(relaunchAndPowerwash.hidden);
 
           fireStatusChanged(UpdateStatus.CHECKING);
           assertAllHidden();
 
           fireStatusChanged(UpdateStatus.UPDATING);
           assertAllHidden();
 
           fireStatusChanged(UpdateStatus.NEARLY_UPDATED);
           assertTrue(checkForUpdates.hidden);
-          assertFalse(relaunch.hidden);
+          assertFalse(relaunchContainer.hidden);
           assertTrue(relaunchAndPowerwash.hidden);
 
           fireStatusChanged(UpdateStatus.UPDATED);
           assertAllHidden();
 
           fireStatusChanged(UpdateStatus.FAILED);
           assertFalse(checkForUpdates.hidden);
-          assertTrue(relaunch.hidden);
+          assertTrue(relaunchContainer.hidden);
           assertTrue(relaunchAndPowerwash.hidden);
 
           fireStatusChanged(UpdateStatus.DISABLED);
           assertAllHidden();
 
           fireStatusChanged(UpdateStatus.DISABLED_BY_ADMIN);
           assertAllHidden();
         });
 
         /**
          * Test that buttons update according to incoming
          * 'update-status-changed' events for the case where the target channel
          * is more stable than current channel.
          */
         test('ButtonsUpdate_BetaToStable', function() {
           aboutBrowserProxy.setChannels(
               BrowserChannel.BETA, BrowserChannel.STABLE);
           aboutBrowserProxy.setUpdateStatus(UpdateStatus.NEARLY_UPDATED);
 
           return initNewPage().then(function() {
-            assertTrue(!!page.$.relaunch);
+            assertTrue(!!page.$.relaunchContainer);
             assertTrue(!!page.$.relaunchAndPowerwash);
 
-            assertTrue(page.$.relaunch.hidden);
+            assertTrue(page.$.relaunchContainer.hidden);
             assertFalse(page.$.relaunchAndPowerwash.hidden);
 
             MockInteractions.tap(page.$.relaunchAndPowerwash);
             return lifetimeBrowserProxy.whenCalled('factoryReset');
           });
         });
 
         /**
          * Test that buttons update according to incoming
          * 'update-status-changed' events for the case where the target channel
          * is less stable than current channel.
          */
         test('ButtonsUpdate_StableToBeta', function() {
           aboutBrowserProxy.setChannels(
               BrowserChannel.STABLE, BrowserChannel.BETA);
           aboutBrowserProxy.setUpdateStatus(UpdateStatus.NEARLY_UPDATED);
 
           return initNewPage().then(function() {
-            assertTrue(!!page.$.relaunch);
+            assertTrue(!!page.$.relaunchContainer);
             assertTrue(!!page.$.relaunchAndPowerwash);
 
-            assertFalse(page.$.relaunch.hidden);
+            assertFalse(page.$.relaunchContainer.hidden);
             assertTrue(page.$.relaunchAndPowerwash.hidden);
 
             MockInteractions.tap(page.$.relaunch);
             return lifetimeBrowserProxy.whenCalled('relaunch');
           });
         });
 
         /**
          * Test that buttons update as a result of receiving a
          * 'target-channel-changed' event (normally fired from
          * <settings-channel-switcher-dialog>).
          */
         test('ButtonsUpdate_TargetChannelChangedEvent', function() {
           aboutBrowserProxy.setChannels(
               BrowserChannel.BETA, BrowserChannel.BETA);
           aboutBrowserProxy.setUpdateStatus(UpdateStatus.NEARLY_UPDATED);
 
           return initNewPage().then(function() {
-            assertFalse(page.$.relaunch.hidden);
+            assertFalse(page.$.relaunchContainer.hidden);
             assertTrue(page.$.relaunchAndPowerwash.hidden);
 
             page.fire('target-channel-changed', BrowserChannel.DEV);
-            assertFalse(page.$.relaunch.hidden);
+            assertFalse(page.$.relaunchContainer.hidden);
             assertTrue(page.$.relaunchAndPowerwash.hidden);
 
             page.fire('target-channel-changed', BrowserChannel.STABLE);
-            assertTrue(page.$.relaunch.hidden);
+            assertTrue(page.$.relaunchContainer.hidden);
             assertFalse(page.$.relaunchAndPowerwash.hidden);
           });
         });
 
         test('RegulatoryInfo', function() {
           var regulatoryInfo = null;
 
           /**
            * Checks the visibility of the "regulatory info" section.
            * @param {boolean} isShowing Whether the section is expected to be
@@ skipping 25 matching lines @@
           });
         });
       }
 
       if (!cr.isChromeOS) {
         /*
          * Test that the "Relaunch" button updates according to incoming
          * 'update-status-changed' events.
          */
         test('ButtonsUpdate', function() {
-          var relaunch = page.$.relaunch;
-          assertTrue(!!relaunch);
+          var relaunchContainer = page.$.relaunchContainer;
+          assertTrue(!!relaunchContainer);
 
           fireStatusChanged(UpdateStatus.CHECKING);
-          assertTrue(relaunch.hidden);
+          assertTrue(relaunchContainer.hidden);
 
           fireStatusChanged(UpdateStatus.UPDATING);
-          assertTrue(relaunch.hidden);
+          assertTrue(relaunchContainer.hidden);
 
           fireStatusChanged(UpdateStatus.NEARLY_UPDATED);
-          assertFalse(relaunch.hidden);
+          assertFalse(relaunchContainer.hidden);
 
           fireStatusChanged(UpdateStatus.UPDATED);
-          assertTrue(relaunch.hidden);
+          assertTrue(relaunchContainer.hidden);
 
           fireStatusChanged(UpdateStatus.FAILED);
-          assertTrue(relaunch.hidden);
+          assertTrue(relaunchContainer.hidden);
 
           fireStatusChanged(UpdateStatus.DISABLED);
-          assertTrue(relaunch.hidden);
+          assertTrue(relaunchContainer.hidden);
 
           fireStatusChanged(UpdateStatus.DISABLED_BY_ADMIN);
-          assertTrue(relaunch.hidden);
+          assertTrue(relaunchContainer.hidden);
         });
       }
 
       test('GetHelp', function() {
         assertTrue(!!page.$.help);
         MockInteractions.tap(page.$.help);
         return aboutBrowserProxy.whenCalled('openHelpPage');
       });
     });
   }
@@ skipping 184 matching lines @@
     registerTests: function() {
       if (cr.isChromeOS) {
         registerDetailedBuildInfoTests();
         registerChannelSwitcherDialogTests();
       }
       registerAboutPageTests();
     },
     registerOfficialBuildTests: registerOfficialBuildTests,
   };
 });