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

chrome/browser/resources/chromeos/chromevox/chromevox.gyp

Index: chrome/browser/resources/chromeos/chromevox/chromevox.gyp
diff --git a/chrome/browser/resources/chromeos/chromevox/chromevox.gyp b/chrome/browser/resources/chromeos/chromevox/chromevox.gyp
index cf729700d968a94bbc2bc60880d6f9bd17c258ca..760675fe4b81ef4895632653b72675c95b5856ff 100644
--- a/chrome/browser/resources/chromeos/chromevox/chromevox.gyp
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox.gyp
@@ -24,8 +24,10 @@
           'type': 'none',
           'dependencies': [
             'chromevox_resources',
-            'chromevox_manifest',
-            'chromevox_guest_manifest',
+            'chromevox1_manifest',
+            'chromevox1_guest_manifest',
+            'chromevox2_manifest',
+            'chromevox2_guest_manifest',
           ],
         },
         {
@@ -154,9 +156,8 @@
           ],
           'includes': ['generate_deps.gypi'],
         },
-        # Used for webstore releases.
-        {
-          'target_name': 'chromevox_webstore_manifest',
+        {
+          'target_name': 'chromevox1_manifest',
           'type': 'none',
           'variables': {
             'output_manifest_path': '<(chromevox_dest_dir)/manifest.json',
@@ -164,23 +165,30 @@
           'includes': [ 'generate_manifest.gypi', ],
         },
         {
-          'target_name': 'chromevox_manifest',
-          'type': 'none',
-          'variables': {
-            'output_manifest_path': '<(chromevox_dest_dir)/manifest.json',
-            # TODO(dtseng): Flip this to 1 once ChromeVox Next is ready.
-            'is_chromevox_next': 0,
-          },
-          'includes': [ 'generate_manifest.gypi', ],
-        },
-        {
-          'target_name': 'chromevox_guest_manifest',
+          'target_name': 'chromevox1_guest_manifest',
           'type': 'none',
           'variables': {
             'output_manifest_path': '<(chromevox_dest_dir)/manifest_guest.json',
             'is_guest_manifest': 1,
-            # TODO(dtseng): Flip this to 1 once ChromeVox Next is ready.
-            'is_chromevox_next': 0,
+          },
+          'includes': [ 'generate_manifest.gypi', ],
+        },
+        {
+          'target_name': 'chromevox2_manifest',
+          'type': 'none',
+          'variables': {
+            'output_manifest_path': '<(chromevox_dest_dir)/manifest_next.json',
+            'is_chromevox_next': 1,
+          },
+          'includes': [ 'generate_manifest.gypi', ],
+        },
+        {
+          'target_name': 'chromevox2_guest_manifest',
+          'type': 'none',
+          'variables': {
+            'output_manifest_path': '<(chromevox_dest_dir)/manifest_next_guest.json',
+            'is_guest_manifest': 1,
+            'is_chromevox_next': 1,
           },
           'includes': [ 'generate_manifest.gypi', ],
         },