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

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

Index: chrome/browser/resources/chromeos/chromevox/chromevox/background/background.js
diff --git a/chrome/browser/resources/chromeos/chromevox/chromevox/background/background.js b/chrome/browser/resources/chromeos/chromevox/chromevox/background/background.js
index fb803d1f863b483abdebc2661a3b4614118e849c..aaccf0636975fc27898cb1cda47da5c3c97f1fa9 100644
--- a/chrome/browser/resources/chromeos/chromevox/chromevox/background/background.js
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/background.js
@@ -122,14 +122,21 @@
       });
 
   var self = this;
-
-  // Inject the content script into all running tabs.
-  chrome.windows.getAll({'populate': true}, function(windows) {
-    for (var i = 0; i < windows.length; i++) {
-      var tabs = windows[i].tabs;
-      self.injectChromeVoxIntoTabs(tabs);
-    }
-  });
+  if (chrome.commandLinePrivate) {
+    chrome.commandLinePrivate.hasSwitch('enable-chromevox-next',
+        goog.bind(function(result) {
+            if (result) {
+              return;
+            }
+            // Inject the content script into all running tabs.
+            chrome.windows.getAll({'populate': true}, function(windows) {
+              for (var i = 0; i < windows.length; i++) {
+                var tabs = windows[i].tabs;
+                self.injectChromeVoxIntoTabs(tabs);
+              }
+            });
+        }, this));
+  }
 
   if (localStorage['active'] == 'false') {
     // Warn the user when the browser first starts if ChromeVox is inactive.