[MD settings] use promises rather than a counter var to fetch cookie data

chrome/browser/resources/settings/site_settings/site_data.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.
 
 /**
  * @fileoverview
  * 'site-data' handles showing the local storage summary list for all sites.
  */
 
 Polymer({
@@ skipping 10 matching lines @@
 
     /**
      * The cookie tree with the details needed to display individual sites and
      * their contained data.
      * @type {!settings.CookieTreeNode}
      * @private
      */
     treeNodes_: Object,
 
     /**
-     * Keeps track of how many outstanding requests for more data there are.
-     * @private
-     */
-    requests_: Number,
-
-    /**
      * The current filter applied to the cookie data list.
      * @private
      */
     filterString_: {
       type: String,
       value: '',
     },
 
     /** @private */
     confirmationDeleteMsg_: String,
@@ skipping 54 matching lines @@
       return loadTimeData.getString('siteSettingsCookieRemoveAll');
     return loadTimeData.getString('siteSettingsCookieRemoveAllShown');
   },
 
   /**
    * Called when the cookie list is ready to be shown.
    * @param {!CookieList} list The cookie list to show.
    * @private
    */
   loadChildren_: function(list) {
-    var parentId = list.id;
-    var data = list.children;
-
-    if (parentId == null) {
-      // New root being added, clear the list and add the nodes.
-      this.sites = [];
-      this.requests_ = 0;
-      this.treeNodes_.addChildNodes(this.treeNodes_, data);
-    } else {
-      this.treeNodes_.populateChildNodes(parentId, this.treeNodes_, data);
-    }
-
-    for (var i = 0; i < data.length; ++i) {
-      var prefix = parentId == null ? '' : parentId + ', ';
-      if (data[i].hasChildren) {
-        ++this.requests_;
-        this.browserProxy.loadCookieChildren(
-            prefix + data[i].id).then(function(list) {
-          --this.requests_;
-          this.loadChildren_(list);
-        }.bind(this));
+    var loadChildrenRecurse = function(list) {
+      var parentId = list.id;
+      var data = list.children;
+      var prefix = '';
+      if (parentId !== null) {
+        this.treeNodes_.populateChildNodes(parentId, this.treeNodes_, data);
+        prefix = parentId + ', ';
       }
-    }
-
-    if (this.requests_ == 0)
+      var promises = [];
+      for (var i = 0; i < data.length; ++i) {
+        assert(data[i].id != null);
+        if (data[i].hasChildren) {
+          promises.push(this.browserProxy.loadCookieChildren(
+              prefix + data[i].id).then(loadChildrenRecurse.bind(this)));
+        }
+      }
+      return Promise.all(promises);
+    }.bind(this);

[dpapad, 2016/10/22 01:05:57]

Perhaps add a \n here?

[dschuyler, 2016/10/22 01:17:11]

Done.

+    // New root being added, clear the list and add the nodes.
+    this.sites = [];
+    this.treeNodes_.addChildNodes(this.treeNodes_, list.children);
+    loadChildrenRecurse(list).then(function() {
       this.sites = this.treeNodes_.getSummaryList();
-
-    // If this reaches below zero then we're forgetting to increase the
-    // outstanding request count and the summary list won't be updated at the
-    // end.
-    assert(this.requests_ >= 0);
+    }.bind(this));
   },
 
   /**
    * Called when a single item has been removed (not during delete all).
    * @param {!CookieRemovePacket} args The details about what to remove.
    * @private
    */
   onTreeItemRemoved_: function(args) {
     this.treeNodes_.removeByParentId(args.id, args.start, args.count);
     this.sites = this.treeNodes_.getSummaryList();
@@ skipping 63 matching lines @@
     this.shadowRoot.appendChild(dialog);
 
     var node = this.treeNodes_.fetchNodeById(event.model.item.id, false);
     dialog.open(node);
 
     dialog.addEventListener('close', function(event) {
       dialog.remove();
     });
   },
 });