Revert of MD Settings: make chrome://[md-]settings/clearBrowserData URL work

chrome/browser/resources/settings/privacy_page/privacy_page.js

Index: chrome/browser/resources/settings/privacy_page/privacy_page.js
diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.js b/chrome/browser/resources/settings/privacy_page/privacy_page.js
index f8a2b7a5644efa698c991bcacf32f62a9fed4dd0..00b0dd17e1868f4b1d697082105af64e4ad9441d 100644
--- a/chrome/browser/resources/settings/privacy_page/privacy_page.js
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.js
@@ -28,41 +28,17 @@
     },
 
     /** @private */
-    showClearBrowsingDataDialog_: {
-      computed: 'computeShowClearBrowsingDataDialog_(currentRoute)',
-      type: Boolean,
-    },
+    showClearBrowsingDataDialog_: Boolean,
   },
 
   ready: function() {
     this.ContentSettingsTypes = settings.ContentSettingsTypes;
   },
 
-  /** @suppress {missingProperties} */
-  attached: function() {
-    settings.main.rendered.then(function() {

[michaelpg, 2016/06/29 01:54:40]

Haha, I guess that's what happens when you suppress missing properties :-P

[16721:1287:0628/183642:ERROR:CONSOLE(44)] "Mocha test failed:
NativeCertificateManager "before each" hook
Error: Uncaught TypeError: Cannot read property 'rendered' of undefined
(privacy_page.js:43)
    at Context.<anonymous> (privacy_page_test.js:78:23)
", source: mocha_adapter.js (44)

privacy_page_test.js (via cr_settings_browsertest.js) loads privacy_page.html
which of course doesn't import settings-main, so this fails

[Dan Beam, 2016/06/29 20:42:49]

tests aren't compiled
our we just not running our tests on try runs?  this is like the second or third
time something hasn't been caught by the try bots.

[michaelpg, 2016/06/29 21:03:29]

I didn't mean to imply causality per se. "And that's why you don't suppress
closure warnings."

-      if (this.showClearBrowsingDataDialog_) {
-        var dialog = this.$$('settings-clear-browsing-data-dialog').$.dialog;
-        // TODO(dbeam): cast to a CrDialogElement when it compiles.
-        dialog.refit();
-      }
-    }.bind(this));
-  },
-
-  /**
-   * @return {boolean} Whether the Clear Browsing Data dialog should be showing.
-   * @private
-   */
-  computeShowClearBrowsingDataDialog_: function() {
-    var route = this.currentRoute;
-    return route && route.dialog == 'clear-browsing-data';
-  },
-
   /** @private */
   onManageCertificatesTap_: function() {
 <if expr="use_nss_certs">
-    var pages = /** @type {!SettingsAnimatedPagesElement} */(this.$.pages);
-    pages.setSubpageChain(['manage-certificates']);
+    this.$.pages.setSubpageChain(['manage-certificates']);
 </if>
 <if expr="is_win or is_macosx">
     settings.PrivacyPageBrowserProxyImpl.getInstance().
@@ -72,18 +48,12 @@
 
   /** @private */
   onSiteSettingsTap_: function() {
-    var pages = /** @type {!SettingsAnimatedPagesElement} */(this.$.pages);
-    pages.setSubpageChain(['site-settings']);
+    this.$.pages.setSubpageChain(['site-settings']);
   },
 
   /** @private */
   onClearBrowsingDataTap_: function() {
-    this.currentRoute = {
-      page: this.currentRoute.page,
-      section: this.currentRoute.section,
-      subpage: this.currentRoute.subpage,
-      dialog: 'clear-browsing-data',
-    };
+    this.showClearBrowsingDataDialog_ = true;
   },
 
   /**
@@ -91,14 +61,7 @@
    * @private
    */
   onIronOverlayClosed_: function(event) {
-    if (Polymer.dom(event).rootTarget.tagName != 'CR-DIALOG')
-      return;
-
-    this.currentRoute = {
-      page: this.currentRoute.page,
-      section: this.currentRoute.section,
-      subpage: this.currentRoute.subpage,
-      // Drop dialog key.
-    };
+    if (Polymer.dom(event).rootTarget.tagName == 'CR-DIALOG')
+      this.showClearBrowsingDataDialog_ = false;
   },
 });