Merge to m57: Ensure ChromeVox defaults to ChromeVox Next on upgrade

chrome/browser/resources/chromeos/chromevox/cvox2/background/background.js

 // Copyright 2014 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 The entry point for all ChromeVox2 related code for the
  * background page.
  */
 
 goog.provide('Background');
@@ skipping 156 matching lines @@
    * @private
    */
   this.focusRecoveryMap_ = new WeakMap();
 
   chrome.automation.getDesktop(function(desktop) {
     /** @type {string} */
     this.chromeChannel_ = desktop.chromeChannel;
   }.bind(this));
 
   // Record a metric with the mode we're in on startup.
-  var useNext = localStorage['useNext'] !== 'false';
+  var useNext = localStorage['useClassic'] != 'true';
   chrome.metricsPrivate.recordValue(
       { metricName: 'Accessibility.CrosChromeVoxNext',
         type: chrome.metricsPrivate.MetricTypeType.HISTOGRAM_LINEAR,
         min: 1,  // According to histogram.h, this should be 1 for enums.
         max: 2,  // Maximum should be exclusive.
         buckets: 3 },  // Number of buckets: 0, 1 and overflowing 2.
       useNext ? 1 : 0);
 };
 
 /**
@@ skipping 36 matching lines @@
    * @type {WeakMap<AutomationNode>}
    */
   get focusRecoveryMap() {
     return this.focusRecoveryMap_;
   },
 
   /**
    * @override
    */
   getMode: function() {
-    var useNext = localStorage['useNext'] !== 'false';
+    var useNext = localStorage['useClassic'] !== 'true';
 
     var target;
     if (!this.getCurrentRange()) {
       chrome.automation.getFocus(function(focus) {
         target = focus;
       });
     } else {
       target = this.getCurrentRange().start.node;
     }
 
@@ skipping 104 matching lines @@
    * the start of the current range.
    * @param {boolean=} opt_setValue Directly set to force next (true) or
    *                                classic/compat (false).
    * @return {boolean} True to announce current position.
    */
   toggleNext: function(opt_setValue) {
     var useNext;
     if (opt_setValue !== undefined)
       useNext = opt_setValue;
     else
-      useNext = localStorage['useNext'] !== 'true';
+      useNext = localStorage['useClassic'] == 'true';
 
     if (useNext) {
       chrome.metricsPrivate.recordUserAction(
           'Accessibility.ChromeVox.ToggleNextOn');
     } else {
       chrome.metricsPrivate.recordUserAction(
           'Accessibility.ChromeVox.ToggleNextOff');
     }
 
-    localStorage['useNext'] = useNext;
+    localStorage['useClassic'] = !useNext;
     if (useNext)
       this.setCurrentRangeToFocus_();
     else
       this.setCurrentRange(null);
 
     var announce = Msgs.getMsg(useNext ?
         'switch_to_next' : 'switch_to_classic');
     cvox.ChromeVox.tts.speak(
         announce, cvox.QueueMode.FLUSH, {doNotInterrupt: true});
 
@@ skipping 463 matching lines @@
   return new RegExp('^(' + globs.map(function(glob) {
     return glob.replace(/[.+^$(){}|[\]\\]/g, '\\$&')
         .replace(/\*/g, '.*')
         .replace(/\?/g, '.');
   }).join('|') + ')$');
 };
 
 new Background();
 
 });  // goog.scope