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

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

 # 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.
 
 {
   'conditions': [
     ['chromeos==1', {
       'variables': {
         # Whether to compress the 4 main ChromeVox scripts.
         'chromevox_compress_js%': '1',
         'chromevox1_background_script_loader_file': 'chromevox/background/loader.js',
         'chromevox1_content_script_loader_file': 'chromevox/injected/loader.js',
         'chromevox1_kbexplorer_loader_file': 'chromevox/background/kbexplorer_loader.js',
         'chromevox1_options_script_loader_file': 'chromevox/background/options_loader.js',
         'chromevox2_background_script_loader_file': 'cvox2/background/loader.js',
       },
       'includes': [
         'chromevox_tests.gypi',
         'common.gypi',
       ],
       'targets': [
         {
           'target_name': 'chromevox',
           'type': 'none',
           'dependencies': [
             'chromevox_resources',
-            'chromevox_manifest',
-            'chromevox_guest_manifest',
+            'chromevox1_manifest',
+            'chromevox1_guest_manifest',
+            'chromevox2_manifest',
+            'chromevox2_guest_manifest',
           ],
         },
         {
           'target_name': 'chromevox_resources',
           'type': 'none',
           'dependencies': [
             'chromevox_assets',
             'chromevox_static_files',
             'chromevox_strings',
             'chromevox_uncompiled_js_files',
@@ skipping 108 matching lines @@
           },
           'sources': [
             '<(chromevox1_background_script_loader_file)',
             '<(chromevox1_content_script_loader_file)',
             '<(chromevox1_kbexplorer_loader_file)',
             '<(chromevox1_options_script_loader_file)',
             '<(chromevox2_background_script_loader_file)',
           ],
           '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',
           },
           'includes': [ 'generate_manifest.gypi', ],
         },
         {
-          'target_name': 'chromevox_manifest',
+          'target_name': 'chromevox1_guest_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,
+            'output_manifest_path': '<(chromevox_dest_dir)/manifest_guest.json',
+            'is_guest_manifest': 1,
           },
           'includes': [ 'generate_manifest.gypi', ],
         },
         {
-          'target_name': 'chromevox_guest_manifest',
+          'target_name': 'chromevox2_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,
+            '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', ],
+        },
       ],
       'conditions': [
         ['chromevox_compress_js==1', {
           'targets': [
             {
               'target_name': 'chromevox1_content_script',
               'type': 'none',
               'variables': {
                 'output_file': '<(chromevox_dest_dir)/chromeVoxChromePageScript.js',
               },
@@ skipping 56 matching lines @@
                 '<(chromevox2_background_script_loader_file)',
               ],
               'includes': [ 'copy_js.gypi', ],
             },
           ],
         }],
       ],
     }],
   ],
 }