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

chrome/browser/extensions/component_loader.cc

Index: chrome/browser/extensions/component_loader.cc
diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc
index 74d4a4efbe8d9dce9179a1e0569ca391743b68aa..38d71a61c8be84170008db5bfef35e651dd73976 100644
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -356,19 +356,11 @@ void ComponentLoader::AddChromeVoxExtension(
       resources_path.Append(extension_misc::kChromeVoxExtensionPath);
 
   const CommandLine* command_line = CommandLine::ForCurrentProcess();
-  bool is_chromevox_next =
-      command_line->HasSwitch(chromeos::switches::kEnableChromeVoxNext);
   bool is_guest = command_line->HasSwitch(chromeos::switches::kGuestSession);
-  const char* manifest_filename;
-  if (is_chromevox_next) {
-    manifest_filename =
-        is_guest ? extension_misc::kChromeVoxNextGuestManifestFilename
-                 : extension_misc::kChromeVoxNextManifestFilename;
-  } else {
-    manifest_filename =
-        is_guest ? extension_misc::kChromeVoxGuestManifestFilename
-                 : extension_misc::kChromeVoxManifestFilename;
-  }
+  const char* manifest_filename =
+      is_guest ? extension_misc::kChromeVoxGuestManifestFilename
+               : extension_misc::kChromeVoxManifestFilename;
+
   BrowserThread::PostTaskAndReplyWithResult(
       BrowserThread::FILE,
       FROM_HERE,