Revert "Add TPM firmware update option to about page."

This reverts commit 2ade99c3.

Reason for revert: Breaks compile on Closure_Compilation_Linux, see https://luci-logdog.appspot.com/v/?s=chromium%2Fbb%2Fchromium.fyi%2FClosure_Compilation_Linux%2F120458%2F%2B%2Frecipes%2Fsteps%2Fcompile%2F0%2Fstdout

Original change's description:
> Add TPM firmware update option to about page.
> 
> BUG=chromium:742985
> TEST=New webui test case in CrSettingsAboutPageTest.AboutPage
> 
> Change-Id: Ie5d5d4f61efb56aa8fe61988bfdbdc44450a34b7
> Reviewed-on: https://chromium-review.googlesource.com/678728
> Commit-Queue: Mattias Nissler <mnissler@chromium.org>
> Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
> Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#504315}

TBR=xiyuan@chromium.org,stevenjb@chromium.org,mnissler@chromium.org

Change-Id: I974a2ff1b144fc912444d41d98c6421270f81987
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: chromium:742985
Reviewed-on: https://chromium-review.googlesource.com/684374Reviewed-by: Mattias Nissler <mnissler@chromium.org>
Commit-Queue: Mattias Nissler <mnissler@chromium.org>
Cr-Commit-Position: refs/heads/master@{#504318}

chrome/app/settings_strings.grdp

@@ -57,12 +57,6 @@
     <message name="IDS_SETTINGS_ABOUT_PAGE_RELAUNCH_AND_POWERWASH" desc="The label for the  button that relaunches and powerwashes the browser once update is complete">
       Relaunch and Powerwash
     </message>
-    <message name="IDS_SETTINGS_ABOUT_TPM_FIRMWARE_UPDATE_TITLE" desc="Title for the line item on the about page that allows the user to trigger a device hardware reset and request installation of a TPM firmware update.">
-      Powerwash for added security
-    </message>
-    <message name="IDS_SETTINGS_ABOUT_TPM_FIRMWARE_UPDATE_DESCRIPTION" desc="Descriptive text shown alongside the line item on the about page that allows the user to trigger a device hardware reset and request installation of a TPM firmware update.">
-      This upgrade resets your Chromebook and removes current user data.
-    </message>
     <message name="IDS_SETTINGS_UPGRADE_UPDATING" desc="Status label: Updating ChromiumOS or ChromeOS">
       Updating your device
     </message>

chrome/browser/resources/settings/about_page/about_page.html

@@ -22,7 +22,6 @@
 <link rel="import" href="detailed_build_info.html">
 <link rel="import" href="update_warning_dialog.html">
 <link rel="import" href="../settings_page/settings_subpage.html">
-<link rel="import" href="../reset_page/powerwash_dialog.html">
 </if>
 
 <if expr="_google_chrome and is_macosx">
@@ -143,25 +142,6 @@
 </if>
               </span>
             </div>
-<if expr="chromeos">
-            <div id="aboutTPMFirmwareUpdate" class="settings-box two-line"
-                hidden$="[[!showTPMFirmwareUpdateLineItem_]]"
-                on-tap="onTPMFirmwareUpdateTap_" actionable>
-              <div class="start">
-                <div>$i18n{aboutTPMFirmwareUpdateTitle}</div>
-                <div class="secondary">
-                  $i18n{aboutTPMFirmwareUpdateDescription}
-                  <a href="$i18n{aboutTPMFirmwareUpdateLearnMoreURL}"
-                      target="_blank" on-tap="onLearnMoreTap_">
-                    $i18n{learnMore}
-                  </a>
-                </div>
-              </div>
-              <button class="subpage-arrow" is="paper-icon-button-light"
-                  aria-labelledby="aboutTPMFirmwareUpdate">
-              </button>
-            </div>
-</if>
 <if expr="_google_chrome and is_macosx">
             <template is="dom-if" if="[[!promoteUpdaterStatus_.hidden]]">
               <div id="promoteUpdater" class="settings-box"
@@ -249,12 +229,6 @@
           on-close="onUpdateWarningDialogClose_">
       </settings-update-warning-dialog>
     </template>
-    <template is="dom-if" if="[[showTPMFirmwareUpdateDialog_]]"
-        restamp>
-      <settings-powerwash-dialog request-tpm-firmware-update
-          on-close="onPowerwashDialogClose_">
-      </settings-powerwash-dialog>
-    </template>
 </if>
   </template>
   <script src="about_page.js"></script>

chrome/browser/resources/settings/about_page/about_page.js

@@ -96,12 +96,6 @@ Polymer({
       value: false,
     },
 
-    /** @private */
-    showTPMFirmwareUpdateLineItem_: Boolean,
-
-    /** @private */
-    showTPMFirmwareUpdateDialog_: Boolean,
-
     /** @private {!AboutPageUpdateInfo|undefined} */
     updateInfo_: Object,
     // </if>
@@ -174,12 +168,6 @@ Polymer({
         this.onPromoteUpdaterStatusChanged_.bind(this));
     // </if>
     this.aboutBrowserProxy_.refreshUpdateStatus();
-    // <if expr="chromeos">
-    this.addWebUIListener(
-        'tpm-firmware-update-status-changed',
-        this.onTPMFirmwareUpdateStatusChanged_.bind(this));
-    this.aboutBrowserProxy_.refreshTPMFirmwareUpdateStatus();
-    // </if>
   },
 
   /**
@@ -218,7 +206,6 @@ Polymer({
       return;
     this.aboutBrowserProxy_.promoteUpdater();
   },
-  // </if>
 
   /**
    * @param {!Event} event
@@ -229,6 +216,7 @@ Polymer({
     // actionable items won't trigger action.
     event.stopPropagation();
   },
+  // </if>
 
   /** @private */
   onHelpTap_: function() {
@@ -455,24 +443,6 @@ Polymer({
     // dialog and then intends to check for update again.
     this.hasCheckedForUpdates_ = false;
   },
-
-  /**
-   * @param {!TPMFirmwareUpdateStatusChangedEvent} event
-   * @private
-   */
-  onTPMFirmwareUpdateStatusChanged_: function(event) {
-    this.showTPMFirmwareUpdateLineItem_ = event.updateAvailable;
-  },
-
-  /** @private */
-  onTPMFirmwareUpdateTap_: function() {
-    this.showTPMFirmwareUpdateDialog_ = true;
-  },
-
-  /** @private */
-  onPowerwashDialogClose_: function() {
-    this.showTPMFirmwareUpdateDialog_ = false;
-  },
   // </if>
 
   /** @private */

chrome/browser/resources/settings/about_page/about_page_browser_proxy.js

@@ -190,11 +190,6 @@ cr.define('settings', function() {
     /** @return {!Promise<?RegulatoryInfo>} */
     getRegulatoryInfo() {}
 
-    /**
-     * Request TPM firmware update status from the browser. It results in one or
-     * more 'tpm-firmware-update-status-changed' WebUI events.
-     */
-    refreshTPMFirmwareUpdateStatus() {}
     // </if>
 
     // <if expr="_google_chrome and is_macosx">
@@ -270,11 +265,6 @@ cr.define('settings', function() {
     getRegulatoryInfo() {
       return cr.sendWithPromise('getRegulatoryInfo');
     }
-
-    /** @override */
-    refreshTPMFirmwareUpdateStatus() {
-      chrome.send('refreshTPMFirmwareUpdateStatus');
-    }
     // </if>
   }
 

chrome/browser/resources/settings/lifetime_browser_proxy.js

@@ -15,13 +15,8 @@ cr.define('settings', function() {
     // First signs out current user and then performs a restart.
     signOutAndRestart() {}
 
-    /**
-     * Triggers a factory reset. The parameter indicates whether to install a
-     * TPM firmware update (if available) after the reset.
-     *
-     * @param {boolean} requestTpmFirmwareUpdate
-     */
-    factoryReset(requestTpmFirmwareUpdate) {}
+    // Triggers a factory reset.
+    factoryReset() {}
     // </if>
   }
 
@@ -46,8 +41,8 @@ cr.define('settings', function() {
     }
 
     /** @override */
-    factoryReset(requestTpmFirmwareUpdate) {
-      chrome.send('factoryReset', [requestTpmFirmwareUpdate]);
+    factoryReset() {
+      chrome.send('factoryReset');
     }
     // </if>
   }

chrome/browser/resources/settings/reset_page/powerwash_dialog.js

@@ -4,17 +4,12 @@
 
 /**
  * @fileoverview
- * 'settings-powerwash-dialog' is a dialog shown to request confirmation from
- * the user for a device reset (aka powerwash).
+ * 'settings-reset-page' is the settings page containing reset
+ * settings.
  */
 Polymer({
   is: 'settings-powerwash-dialog',
 
-  properties: {
-    /** @public */
-    requestTpmFirmwareUpdate: Boolean,
-  },
-
   /** @override */
   attached: function() {
     settings.ResetBrowserProxyImpl.getInstance().onPowerwashDialogShow();
@@ -28,7 +23,6 @@ Polymer({
 
   /** @private */
   onRestartTap_: function() {
-    settings.LifetimeBrowserProxyImpl.getInstance().factoryReset(
-        this.requestTpmFirmwareUpdate);
+    settings.LifetimeBrowserProxyImpl.getInstance().factoryReset();
   },
 });

chrome/browser/ui/webui/settings/about_handler.cc

@@ -61,7 +61,6 @@
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
-#include "chrome/browser/chromeos/tpm_firmware_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/chromeos/image_source.h"
 #include "chrome/browser/ui/webui/help/help_utils_chromeos.h"
@@ -375,10 +374,6 @@ void AboutHandler::RegisterMessages() {
   web_ui()->RegisterMessageCallback(
       "getChannelInfo", base::Bind(&AboutHandler::HandleGetChannelInfo,
                                    base::Unretained(this)));
-  web_ui()->RegisterMessageCallback(
-      "refreshTPMFirmwareUpdateStatus",
-      base::Bind(&AboutHandler::HandleRefreshTPMFirmwareUpdateStatus,
-                 base::Unretained(this)));
 #endif
 #if defined(OS_MACOSX)
   web_ui()->RegisterMessageCallback(
@@ -591,18 +586,6 @@ void AboutHandler::RequestUpdateOverCellular(const std::string& update_version,
       update_version, update_size);
 }
 
-void AboutHandler::HandleRefreshTPMFirmwareUpdateStatus(
-    const base::ListValue* args) {
-  chromeos::tpm_firmware_update::ShouldOfferUpdateViaPowerwash(
-      base::Bind(&AboutHandler::RefreshTPMFirmwareUpdateStatus,
-                 weak_factory_.GetWeakPtr()));
-}
-
-void AboutHandler::RefreshTPMFirmwareUpdateStatus(bool update_available) {
-  std::unique_ptr<base::DictionaryValue> event(new base::DictionaryValue);
-  event->SetBoolean("updateAvailable", update_available);
-  FireWebUIListener("tpm-firmware-update-status-changed", *event);
-}
 #endif  // defined(OS_CHROMEOS)
 
 void AboutHandler::RequestUpdate() {

chrome/browser/ui/webui/settings/about_handler.h

@@ -114,10 +114,6 @@ class AboutHandler : public settings::SettingsPageUIHandler,
   void RequestUpdateOverCellular(const std::string& update_version,
                                  int64_t update_size);
 
-  // Called once when the page has loaded to retrieve the TPM firmware update
-  // status.
-  void HandleRefreshTPMFirmwareUpdateStatus(const base::ListValue* args);
-  void RefreshTPMFirmwareUpdateStatus(bool update_available);
 #endif
 
   // Checks for and applies update.

chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

@@ -258,10 +258,6 @@ void AddAboutStrings(content::WebUIDataSource* html_source) {
     {"aboutUpgradeSuccessChannelSwitch",
      IDS_SETTINGS_UPGRADE_SUCCESSFUL_CHANNEL_SWITCH},
     {"aboutUserAgentLabel", IDS_VERSION_UI_USER_AGENT},
-    {"aboutTPMFirmwareUpdateTitle",
-     IDS_SETTINGS_ABOUT_TPM_FIRMWARE_UPDATE_TITLE},
-    {"aboutTPMFirmwareUpdateDescription",
-     IDS_SETTINGS_ABOUT_TPM_FIRMWARE_UPDATE_DESCRIPTION},
 
     // About page, channel switcher dialog.
     {"aboutChangeChannel", IDS_SETTINGS_ABOUT_PAGE_CHANGE_CHANNEL},
@@ -300,11 +296,6 @@ void AddAboutStrings(content::WebUIDataSource* html_source) {
 #else
       l10n_util::GetStringUTF16(IDS_SETTINGS_UPGRADE_UP_TO_DATE));
 #endif
-
-#if defined(OS_CHROMEOS)
-  html_source->AddString("aboutTPMFirmwareUpdateLearnMoreURL",
-                         chrome::kTPMFirmwareUpdateLearnMoreURL);
-#endif
 }
 
 #if defined(OS_CHROMEOS)

chrome/common/url_constants.cc

@@ -626,8 +626,6 @@ const char kAndroidAppsLearnMoreURL[] =
     "https://support.google.com/chromebook/?p=playapps";
 const char kInstantTetheringLearnMoreURL[] =
     "https://support.google.com/chromebook?p=instant_tethering";
-const char kTPMFirmwareUpdateLearnMoreURL[] =
-    "https://support.google.com/chromebook/?p=tpm_update";
 #endif
 
 const char kRemoveNonCWSExtensionURL[] =

chrome/common/url_constants.h

@@ -522,9 +522,6 @@ extern const char kAndroidAppsLearnMoreURL[];
 
 // The URL for the "learn more" link for Instant Tethering.
 extern const char kInstantTetheringLearnMoreURL[];
-
-// The URL for the "learn more" link for TPM firmware update.
-extern const char kTPMFirmwareUpdateLearnMoreURL[];
 #endif
 
 // The URL for the Learn More link of the non-CWS bubble.

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

@@ -18,7 +18,6 @@ cr.define('settings_about_page', function() {
           'getChannelInfo',
           'getVersionInfo',
           'getRegulatoryInfo',
-          'refreshTPMFirmwareUpdateStatus',
           'setChannel');
       }
 
@@ -47,11 +46,6 @@ cr.define('settings_about_page', function() {
 
         /** @private {?RegulatoryInfo} */
         this.regulatoryInfo_ = null;
-
-        /** @private {!TPMFirmwareUpdateStatus} */
-        this.tpmFirmwareUpdateStatus_ = {
-          updateAvailable: false,
-        };
       }
     }
 
@@ -152,20 +146,6 @@ cr.define('settings_about_page', function() {
         channel, isPowerwashAllowed) {
       this.methodCalled('setChannel', [channel, isPowerwashAllowed]);
     };
-
-    /** @param {!TPMFirmwareUpdateStatus} status */
-    TestAboutPageBrowserProxy.prototype.setTPMFirmwareUpdateStatus = function(
-        status) {
-      this.tpmFirmwareUpdateStatus_ = status;
-    };
-
-    /** @override */
-    TestAboutPageBrowserProxy.prototype.refreshTPMFirmwareUpdateStatus =
-        function() {
-      this.methodCalled('refreshTPMFirmwareUpdateStatus');
-      cr.webUIListenerCallback(
-          'tpm-firmware-update-status-changed', this.tpmFirmwareUpdateStatus_);
-    };
   }
 
 
@@ -229,7 +209,6 @@ cr.define('settings_about_page', function() {
           return Promise.all([
             aboutBrowserProxy.whenCalled('getChannelInfo'),
             aboutBrowserProxy.whenCalled('refreshUpdateStatus'),
-            aboutBrowserProxy.whenCalled('refreshTPMFirmwareUpdateStatus'),
           ]);
         }
       }
@@ -564,27 +543,6 @@ cr.define('settings_about_page', function() {
             return checkRegulatoryInfo(true);
           });
         });
-
-        test('TPMFirmwareUpdate', function() {
-          return initNewPage().then(function() {
-            assertTrue(page.$.aboutTPMFirmwareUpdate.hidden);
-            aboutBrowserProxy.setTPMFirmwareUpdateStatus(
-                {updateAvailable: true});
-            aboutBrowserProxy.refreshTPMFirmwareUpdateStatus();
-          }).then(function() {
-            assertFalse(page.$.aboutTPMFirmwareUpdate.hidden);
-            MockInteractions.tap(page.$.aboutTPMFirmwareUpdate);
-          }).then(function() {
-            var dialog = page.$$('settings-powerwash-dialog');
-            assertTrue(!!dialog);
-            assertTrue(dialog.$.dialog.open);
-            MockInteractions.tap(dialog.$$('#powerwash'));
-            return lifetimeBrowserProxy.whenCalled('factoryReset')
-                .then(function(requestTpmFirmwareUpdate) {
-                  assertTrue(requestTpmFirmwareUpdate);
-                });
-          });
-        });
       }
 
       if (!cr.isChromeOS) {

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

@@ -35,9 +35,8 @@ cr.define('settings', function() {
     };
 
     /** @override */
-    TestLifetimeBrowserProxy.prototype.factoryReset = function(
-        requestTpmFirmwareUpdate) {
-      this.methodCalled('factoryReset', requestTpmFirmwareUpdate);
+    TestLifetimeBrowserProxy.prototype.factoryReset = function() {
+      this.methodCalled('factoryReset');
     };
   }