Enable runtime switching between ChromeVox and ChromeVox next via command line.

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

Index: chrome/browser/resources/chromeos/chromevox/cvox2/background/background.extjs
diff --git a/chrome/browser/resources/chromeos/chromevox2/cvox2/background/background.extjs b/chrome/browser/resources/chromeos/chromevox/cvox2/background/background.extjs
similarity index 78%
rename from chrome/browser/resources/chromeos/chromevox2/cvox2/background/background.extjs
rename to chrome/browser/resources/chromeos/chromevox/cvox2/background/background.extjs
index 74abf72bf972b11e7f06d1af5494fb2e6cece00b..207d70732f405a2234804763e1e61a6ed1adc7bb 100644
--- a/chrome/browser/resources/chromeos/chromevox2/cvox2/background/background.extjs
+++ b/chrome/browser/resources/chromeos/chromevox/cvox2/background/background.extjs
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 // Include test fixture.
-GEN_INCLUDE(['../../../chromevox/testing/chromevox_e2e_test_base.js']);
+GEN_INCLUDE(['../../testing/chromevox_e2e_test_base.js']);
 
 /**
  * Test fixture for cvox2.Background.
@@ -15,6 +15,24 @@ function BackgroundTest() {}
 BackgroundTest.prototype = {
   __proto__: ChromeVoxE2ETest.prototype,
 
+  // This method is called without a |this| instance bound.
+  /** @override */
+  testGenCppIncludes: function() {
+    ChromeVoxE2ETest.prototype.testGenCppIncludes.call(this);
+    GEN('#include "base/command_line.h"');
+    GEN('#include "chromeos/chromeos_switches.h"');
+  },
+
+  // This method is called without a |this| instance bound.
+  /** @override */
+  testGenPreamble: function() {
+    GEN_BLOCK(function() {/*!
+      CommandLine* command_line = CommandLine::ForCurrentProcess();
+      command_line->AppendSwitch(chromeos::switches::kEnableChromeVoxNext);
+    */});
+    ChromeVoxE2ETest.prototype.testGenPreamble.call(this);
+  },
+
   /** @override */
   setUp: function() {
     this.mockTts = new MockTts();