HistoricNetworkStatsInfoToValue should use statistics prefs values

chrome/test/data/webui/net_internals/bandwidth_view.js

 // Copyright (c) 2012 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.
 
 // Include test fixture.
 GEN_INCLUDE(['net_internals_test.js']);
 
 // Anonymous namespace
 (function() {
 
@@ skipping 41 matching lines @@
   /**
    * Switches to the bandwidth tab, loads a page in the background, and waits
    * for the arrival of network statistics.
    *
    * @param {string} url URL to be fetched.
    */
   start: function(url) {
     assertEquals('string', typeof url);
     this.url_ = url;
     g_browser.addSessionNetworkStatsObserver(this, true);
-    g_browser.addHistoricNetworkStatsObserver(this, false);
+    g_browser.addHistoricNetworkStatsObserver(this, true);
     NetInternalsTest.switchToView('bandwidth');
     chrome.send('loadPage', [this.url_]);
   },
 
   /**
    * Returns the float value the specified cell of the bandwidth table.
    */
   getBandwidthTableCell_: function(row, col) {
     return parseFloat(NetInternalsTest.getTbodyText(
         BandwidthView.STATS_BOX_ID, row, col));
@@ skipping 36 matching lines @@
     }
   },
 
   /**
    * SessionNetworkStatsObserver function.  Sanity checks the received data
    * and constructed table.
 
    * @param {object} networkStats State of the network session.
    */
   onSessionNetworkStatsChanged: function(networkStats) {
-    if (this.isDone() || this.sessionVerified)
+    if (this.isDone())
       return;
     // Wait until the received content length is at least the size of
     // our test page and favicon.
     var expectedLength = this.expectedLength_ + this.faviconLength_;
     if (networkStats.session_received_content_length >= expectedLength) {
       expectLE(expectedLength, networkStats.session_original_content_length);
       // Column 1 contains session information.
       this.validateBandwidthTableColumn_(1, expectedLength, expectedLength);
       this.sessionVerified = true;
       this.completeIfDone();
     }
   },
 
   /**
    * HistoricNetworkStatsObserver function.  Sanity checks the received data
    * and constructed table.
 
    * @param {object} networkStats State of the network session.
    */
   onHistoricNetworkStatsChanged: function(networkStats) {
-    if (this.isDone() || this.historicVerified)
+    if (this.isDone())
       return;
-    // The received content length should be zero since the historic
-    // information only updates every hour.
-    var expectedLength = 0;
-    // Wait until the table has changed, otherwise the columns will be NaN
-    if (!isNaN(this.getBandwidthTableCell_(0, 2))) {
+    // Wait until the received content length is at least the size of
+    // our test page and favicon.
+    var expectedLength = this.expectedLength_ + this.faviconLength_;
+    if (networkStats.historic_received_content_length >= expectedLength) {
       expectLE(expectedLength, networkStats.historic_original_content_length);
-      // Column 2 contains historic information.
+      // Column 2 contains historic information. The expected length should
+      // only be what has been collected in this session, because previously
+      // there was no history
       this.validateBandwidthTableColumn_(2, expectedLength, expectedLength);
       this.historicVerified = true;
       this.completeIfDone();
     }
   }
 };
 
 DataReductionProxyTask.prototype = {
   __proto__: NetInternalsTest.Task.prototype,
 
@@ skipping 107 matching lines @@
  */
 TEST_F('NetInternalsTest',
        'DISABLED_netInternalsDataReductionProxyDisabled',
        function() {
   var taskQueue = new NetInternalsTest.TaskQueue(true);
   taskQueue.addTask(new DataReductionProxyTask(false));
   taskQueue.run();
 });
 
 })();  // Anonymous namespace