Fix up aggregate dashboard to use the new data. The only thing missing now is...

webkit/tools/layout_tests/dashboards/dashboard_base.js

 /**
  * @fileoverview Base JS file for pages that want to parse the results JSON
  * from the testing bots. This deals with generic utility functions, visible
  * history, popups and appending the script elements for the JSON files.
  *
  * The calling page is expected to implement three "abstract" functions/objects.
  * generatePage, validateHashParameter and defaultStateValues.
  */
  var pageLoadStartTime = Date.now();
 
@@ skipping 30 matching lines @@
   'P': 'PASS',
   'F': 'TEXT FAIL',
   'S': 'SIMPLIFIED',
   'I': 'IMAGE',
   'O': 'OTHER',
   'N': 'NO DATA',
   'X': 'SKIP'
 };
 
 // Keys in the JSON files.
-var NON_WONTFIX_COUNTS_KEY = 'nonWontfixCounts';
-var ALL_COUNTS_KEY = 'allCounts';
+var WONTFIX_COUNTS_KEY = 'wontfixCounts';
+var FIXABLE_COUNTS_KEY = 'fixableCounts';
 var DEFERRED_COUNTS_KEY = 'deferredCounts';
-var NON_WONTFIX_DESCRIPTION = 'All tests we want to pass for this release';
-var ALL_COUNTS_DESCRIPTION = 'All tests (inludes WONTFIX)';
-var DEFERRED_DESCRIPTION = 'All deferred tests';
+var WONTFIX_DESCRIPTION = 'Tests never to be fixed (WONTFIX)';
+var FIXABLE_DESCRIPTION = 'All tests for this release';
+var DEFERRED_DESCRIPTION = 'All deferred tests (DEFER)';
 var FIXABLE_COUNT_KEY = 'fixableCount';
+var ALL_FIXABLE_COUNT_KEY = 'allFixableCount';
 var CHROME_REVISIONS_KEY = 'chromeRevision';
 var WEBKIT_REVISIONS_KEY = 'webkitRevision';
 
 /**
  * Takes a key and a value and sets the currentState[key] = value iff key is
  * a valid hash parameter and the value is a valid value for that key. Handles
  * cross-dashboard parameters then falls back to calling
  * handleValidHashParameter for dashboard-specific parameters.
  *
  * @return {boolean} Whether the key what inserted into the currentState.
@@ skipping 281 matching lines @@
 
 window.addEventListener('load', function() {
       // This doesn't seem totally accurate as there is a race between
       // onload firing and the last script tag being executed.
       logTime('Time to load JS', pageLoadStartTime);
       setInterval(function() {
         if (oldLocation != window.location.href)
           handleLocationChange();
       }, 100);
     }, false);