Revert of Various changes required to support ChromeVox Next to read Views and Windows.

chrome/browser/resources/chromeos/chromevox/testing/chromevox_next_e2e_test_base.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.
 
 // Include test fixture.
 GEN_INCLUDE(['chrome/browser/resources/chromeos/chromevox/testing/' +
     'chromevox_e2e_test_base.js']);
 
 /**
  * Base test fixture for ChromeVox Next end to end tests.
  *
  * These tests are identical to ChromeVoxE2ETests except for performing the
  * necessary setup to run ChromeVox Next.
  * @constructor
  * @extends {ChromeVoxE2ETest}
  */
 function ChromeVoxNextE2ETest() {}
 
 ChromeVoxNextE2ETest.prototype = {
   __proto__: ChromeVoxE2ETest.prototype,
 
   /**
    * This method is called without |this| bound to an instance of
    * ChromeVoxNextE2ETest.
    * @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 |this| bound to an instance of
+   * ChromeVoxNextE2ETest.
+   * @override
+   */
+  testGenPreamble: function() {
+    GEN_BLOCK(function() {/*!
+      CommandLine* command_line = CommandLine::ForCurrentProcess();
+      command_line->AppendSwitch(chromeos::switches::kEnableChromeVoxNext);
+    */});
+    ChromeVoxE2ETest.prototype.testGenPreamble.call(this);
   },
 
   runWithAutomation: function(doc, callback) {
     this.runWithDocument(doc, function() {
       chrome.automation.getTree(function(root) {
         callback(root);
       }.bind(this));
     }.bind(this));
   }
 };