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

Revert of MD Settings: make chrome://[md-]settings/clearBrowserData URL work (patchset #7 id:120001 of https://codereview.chromium.org/2094223004/ )

Reason for revert:
Looks like this is causing CrSettingsPrivacyPageTest.PrivacyPage to fail on Mac10.9 and Mac ASAN

Original issue's description:
> MD Settings: make chrome://[md-]settings/clearBrowserData URL work
>
> R=michaelpg@chromium.org
> BUG=622037
> CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:closure_compilation
>
> Committed: https://crrev.com/a6ecac07f74cf819dc164bb91f721e596c261cd2
> Cr-Commit-Position: refs/heads/master@{#402614}

TBR=michaelpg@chromium.org,dbeam@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=622037

Review-Url: https://codereview.chromium.org/2103653004
Cr-Commit-Position: refs/heads/master@{#402651}

chrome/browser/resources/settings/compiled_resources2.gyp

@@ -21,7 +21,6 @@
         'people_page/compiled_resources2.gyp:*',
         'prefs/compiled_resources2.gyp:*',
         'printing_page/compiled_resources2.gyp:*',
-        'privacy_page/compiled_resources2.gyp:*',
         'reset_page/compiled_resources2.gyp:*',
         'settings_main/compiled_resources2.gyp:*',
         'settings_page/compiled_resources2.gyp:*',

chrome/browser/resources/settings/privacy_page/compiled_resources2.gyp

-# 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.
-{
-  'targets': [
-    {
-      'target_name': 'privacy_page_browser_proxy',
-      'dependencies': [
-        '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:cr',
-        '<(EXTERNS_GYP):chrome_send',
-      ],
-      'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],
-    },
-    {
-      'target_name': 'privacy_page',
-      'dependencies': [
-        'privacy_page_browser_proxy',
-        '../site_settings/compiled_resources2.gyp:constants',
-        '../settings_main/compiled_resources2.gyp:settings_main',
-        '../settings_page/compiled_resources2.gyp:settings_animated_pages',
-      ],
-      'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],
-    },
-  ],
-}

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

@@ -28,41 +28,17 @@ Polymer({
     },
 
     /** @private */
-    showClearBrowsingDataDialog_: {
-      computed: 'computeShowClearBrowsingDataDialog_(currentRoute)',
-      type: Boolean,
-    },
+    showClearBrowsingDataDialog_: Boolean,
   },
 
   ready: function() {
     this.ContentSettingsTypes = settings.ContentSettingsTypes;
   },
 
-  /** @suppress {missingProperties} */
-  attached: function() {
-    settings.main.rendered.then(function() {
-      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 @@ Polymer({
 
   /** @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 @@ Polymer({
    * @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;
   },
 });

chrome/browser/resources/settings/settings_main/compiled_resources2.gyp

@@ -6,8 +6,6 @@
     {
       'target_name': 'settings_main',
       'dependencies': [
-        '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:cr',
-        '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:promise_resolver',
         '../settings_page/compiled_resources2.gyp:main_page_behavior',
         '../settings_page/compiled_resources2.gyp:settings_router',
       ],

chrome/browser/resources/settings/settings_main/settings_main.html

 <link rel="import" href="chrome://resources/cr_elements/icons.html">
-<link rel="import" href="chrome://resources/html/assert.html">
 <link rel="import" href="chrome://resources/html/polymer.html">
-<link rel="import" href="chrome://resources/html/promise_resolver.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
 <link rel="import" href="/about_page/about_page.html">
 <link rel="import" href="/advanced_page/advanced_page.html">

chrome/browser/resources/settings/settings_main/settings_main.js

@@ -2,10 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-(function() {
-
-var resolver = new PromiseResolver();
-
 /**
  * @fileoverview
  * 'settings-main' displays the selected settings page.
@@ -68,25 +64,15 @@ Polymer({
       this.showAdvancedPage_ = e.detail;
       this.isAdvancedMenuOpen_ = e.detail;
       if (this.showAdvancedPage_) {
-        doWhenReady(
+        scrollWhenReady(
             function() {
-              var advancedPage = this.$$('settings-advanced-page');
-              return !!advancedPage && advancedPage.scrollHeight > 0;
+              return this.$$('settings-advanced-page');
             }.bind(this),
             function() {
-              this.$$('#toggleContainer').scrollIntoView();
+              return this.$$('#toggleContainer');
             }.bind(this));
       }
     }.bind(this));
-
-    doWhenReady(
-        function() {
-          var basicPage = this.$$('settings-basic-page');
-          return !!basicPage && basicPage.scrollHeight > 0;
-        }.bind(this),
-        function() {
-          resolver.resolve();
-        });
   },
 
   /**
@@ -123,9 +109,3 @@ Polymer({
     this.fire('toggle-advanced-page', !this.isAdvancedMenuOpen_);
   },
 });
-
-cr.define('settings.main', function() {
-  return {rendered: resolver.promise};
-});
-
-})();

chrome/browser/resources/settings/settings_page/main_page_behavior.js

@@ -7,20 +7,22 @@ var EASING_FUNCTION = 'cubic-bezier(0.4, 0, 0.2, 1)';
 var EXPAND_DURATION = 350;
 
 /**
- * Calls |readyTest| repeatedly until it returns true, then calls
- * |readyCallback|.
- * @param {function():boolean} readyTest
- * @param {!Function} readyCallback
+ * Workaround for scrolling an element into view when using Polymer.
+ * @param {function():Element} containerCallback Return parent of element.
+ * @param {function():Element} elementCallback Return element to scroll to.
  */
-function doWhenReady(readyTest, readyCallback) {
-  // TODO(dschuyler): Determine whether this hack can be removed.
+function scrollWhenReady(containerCallback, elementCallback) {
+  // TODO(dschuyler): Determine whether this setTimeout can be removed.
   // See also: https://github.com/Polymer/polymer/issues/3629
-  var intervalId = setInterval(function() {
-    if (readyTest()) {
-      clearInterval(intervalId);
-      readyCallback();
+  setTimeout(function pollForScrollHeight() {
+    var container = containerCallback();
+    if (!container || container.scrollHeight == 0) {
+      setTimeout(pollForScrollHeight.bind(this), 10);
+      return;
     }
-  }, 10);
+
+    elementCallback().scrollIntoView();
+  }.bind(this));
 }
 
 /**
@@ -367,14 +369,14 @@ var RoutableBehaviorImpl = {
 
   /** @private */
   scrollToSection_: function() {
-    doWhenReady(
+    scrollWhenReady(
         function() {
-          return this.scrollHeight > 0;
+          return this;
         }.bind(this),
         function() {
           // If the current section changes while we are waiting for the page to
           // be ready, scroll to the newest requested section.
-          this.getSection_(this.currentRoute.section).scrollIntoView();
+          return this.getSection_(this.currentRoute.section);
         }.bind(this));
   },
 

chrome/browser/resources/settings/settings_page/settings_router.js

@@ -8,7 +8,6 @@
  *   page: string,
  *   section: string,
  *   subpage: !Array<string>,
- *   dialog: (string|undefined),
  * }}
  */
 var SettingsRoute;
@@ -59,7 +58,6 @@ Polymer({
               page: route.page,
               section: route.section,
               subpage: route.subpage,
-              dialog: route.dialog,
             };
           }
         }
@@ -427,8 +425,7 @@ Polymer({
       url: '/clearBrowserData',
       page: 'advanced',
       section: 'privacy',
-      subpage: [],
-      dialog: 'clear-browsing-data',
+      subpage: ['clear-browsing-data'],
     },
 <if expr="chromeos">
     {
@@ -587,13 +584,12 @@ Polymer({
   currentRouteChanged_: function(newRoute, oldRoute) {
     for (var i = 0; i < this.routes_.length; ++i) {
       var route = this.routes_[i];
-      if (route.page == newRoute.page &&
-          route.section == newRoute.section &&
-          route.dialog == newRoute.dialog &&
+      if (route.page == newRoute.page && route.section == newRoute.section &&
           route.subpage.length == newRoute.subpage.length &&
           newRoute.subpage.every(function(value, index) {
             return value == route.subpage[index];
           })) {
+
         // Update the property containing the titles for the current route.
         this.currentRouteTitles = {
           pageTitle: loadTimeData.getString(route.page + 'PageTitle'),
@@ -609,7 +605,6 @@ Polymer({
           page: newRoute.page,
           section: newRoute.section,
           subpage: newRoute.subpage,
-          dialog: newRoute.dialog,
         };
 
         // Push the current route to the history state, so when the user