Switch PPAPITests to run in browser_tests instead of ui_tests. The former is sharded and so tests r…

chrome/chrome_tests.gypi

 # Copyright (c) 2012 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.
 {
   'variables' : {
     'pyautolib_sources': [
       'app/chrome_command_ids.h',
       'app/chrome_dll_resource.h',
       'common/automation_constants.h',
       'common/pref_names.cc',
@@ skipping 755 matching lines @@
           'sources!': [
             'browser/ui/views/constrained_window_views_browsertest.cc',
             'browser/ui/views/ssl_client_certificate_selector_browsertest.cc',
           ],
         }],  # OS != "win"
       ],  # conditions
     },
     {
       'target_name': 'ui_tests',
       'type': 'executable',
-      'copies': [
-        {
-          'destination': '<(PRODUCT_DIR)',
-          'files': [
-            # Keep 'test_case.html.mock-http-headers' with 'test_case.html'.
-            '../ppapi/tests/test_case.html',
-            '../ppapi/tests/test_case.html.mock-http-headers',
-            '../ppapi/tests/test_page.css',
-            '../ppapi/native_client/tests/ppapi_tests/test_case.nmf',
-          ],
-        },
-        {
-          'destination': '<(PRODUCT_DIR)/test_url_loader_data',
-          'files': [
-            '../ppapi/tests/test_url_loader_data/hello.txt',
-          ],
-        },
-      ],
       'dependencies': [
         'browser',
         'chrome',
         'chrome_resources.gyp:chrome_resources',
         'chrome_resources.gyp:chrome_strings',
         'common',
         'test_support_ui',
         '../base/base.gyp:base',
         '../net/net.gyp:net',
         '../net/net.gyp:net_test_support',
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../skia/skia.gyp:skia',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/libxml/libxml.gyp:libxml',
         # run time dependencies
-        '../ppapi/ppapi_internal.gyp:ppapi_tests',
         '../third_party/mesa/mesa.gyp:osmesa',
         '../webkit/webkit.gyp:pull_in_copy_TestNetscapePlugIn',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
+        # NOTE: DON'T ADD NEW TESTS HERE!
+        # New tests should be browser_tests. browser_tests are sharded and are
+        # less flakier.
         'app/chrome_main_uitest.cc',
         'browser/audio_layout_uitest.cc',
         'browser/browser_encoding_uitest.cc',
         'browser/custom_handlers/custom_handlers_uitest.cc',
         'browser/download/save_page_uitest.cc',
         'browser/fast_shutdown_uitest.cc',
         'browser/history/multipart_uitest.cc',
         'browser/history/redirect_uitest.cc',
         'browser/iframe_uitest.cc',
         'browser/images_uitest.cc',
@@ skipping 27 matching lines @@
         'renderer/loadtimes_extension_bindings_uitest.cc',
         'test/automation/automation_proxy_uitest.cc',
         'test/automation/automation_proxy_uitest.h',
         'test/automation/extension_proxy_uitest.cc',
         'test/base/chrome_process_util_uitest.cc',
         'test/reliability/automated_ui_test_test.cc',
         'test/ui/history_uitest.cc',
         'test/ui/layout_plugin_uitest.cc',
         'test/ui/named_interface_uitest.cc',
         'test/ui/npapi_uitest.cc',
-        'test/ui/ppapi_uitest.cc',
         'test/ui/sandbox_uitests.cc',
         '../content/browser/appcache/appcache_ui_test.cc',
         '../content/browser/in_process_webkit/dom_storage_uitest.cc',
         '../content/browser/in_process_webkit/indexed_db_uitest.cc',
         '../content/browser/renderer_host/resource_dispatcher_host_uitest.cc',
         '../content/worker/test/worker_uitest.cc',
+        # DON'T ADD NEW FILES! SEE NOTE AT TOP OF SECTION.
       ],
       'conditions': [
-        ['disable_nacl==0 and disable_nacl_untrusted==0', {
-          'dependencies': [
-            '../ppapi/ppapi_untrusted.gyp:ppapi_nacl_tests',
-          ],
-        }],
         ['target_arch!="arm"', {
           'dependencies': [
             '../webkit/webkit.gyp:copy_npapi_test_plugin',
           ],
         }],
         ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
@@ skipping 1623 matching lines @@
           ]},
         ],
       ],
     },
     {
       # Executable that runs each browser test in a new process.
       'target_name': 'browser_tests',
       'type': 'executable',
       'msvs_cygwin_shell': 0,
       'msvs_cygwin_dirs': ['<(DEPTH)/third_party/cygwin'],
+      'copies': [
+        {
+          'destination': '<(PRODUCT_DIR)',
+          'files': [
+            # Keep 'test_case.html.mock-http-headers' with 'test_case.html'.
+            '../ppapi/tests/test_case.html',
+            '../ppapi/tests/test_case.html.mock-http-headers',
+            '../ppapi/tests/test_page.css',
+            '../ppapi/native_client/tests/ppapi_tests/test_case.nmf',
+          ],
+        },
+        {
+          'destination': '<(PRODUCT_DIR)/test_url_loader_data',
+          'files': [
+            '../ppapi/tests/test_url_loader_data/hello.txt',
+          ],
+        },
+      ],
       'dependencies': [
         'browser',
         '../sync/protocol/sync_proto.gyp:sync_proto',
         'chrome',
         'chrome_resources.gyp:chrome_resources',
         'chrome_resources.gyp:chrome_strings',
         'common/extensions/api/api.gyp:api',
         'renderer',
         'test_support_common',
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../base/base.gyp:test_support_base',
         '../net/net.gyp:net',
         '../net/net.gyp:net_test_support',
         '../skia/skia.gyp:skia',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/cld/cld.gyp:cld',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
         '../v8/tools/gyp/v8.gyp:v8',
         '../webkit/webkit.gyp:test_shell_test_support',
         # Runtime dependencies
+        '../ppapi/ppapi_internal.gyp:ppapi_tests',
         '../third_party/mesa/mesa.gyp:osmesa',
         '../webkit/webkit.gyp:pull_in_copy_TestNetscapePlugIn',
       ],
       'include_dirs': [
         '..',
       ],
       'defines': [
         'HAS_OUT_OF_PROC_TEST_RUNNER',
         'BROWSER_TESTS_HEADER_OVERRIDE="chrome/test/base/in_process_browser_test.h"',
       ],
@@ skipping 326 matching lines @@
         'test/data/webui/net_internals/main.js',
         'test/data/webui/net_internals/net_internals_test.js',
         'test/data/webui/net_internals/prerender_view.js',
         'test/data/webui/net_internals/test_view.js',
         'test/data/webui/net_internals/timeline_view.js',
         'test/data/webui/ntp4.js',
         'test/data/webui/print_preview.h',
         'test/data/webui/print_preview.cc',
         'test/data/webui/print_preview.js',
         'test/gpu/gpu_feature_browsertest.cc',
+        'test/ui/ppapi_uitest.cc',
         # TODO(craig): Rename this and run from base_unittests when the test
         # is safe to run there. See http://crbug.com/78722 for details.
         '../base/files/file_path_watcher_browsertest.cc',
         '../content/app/startup_helper_win.cc',
         '../content/browser/accessibility/dump_accessibility_tree_browsertest.cc',
         '../content/browser/accessibility/dump_accessibility_tree_helper_mac.mm',
         '../content/browser/accessibility/dump_accessibility_tree_helper_win.cc',
         '../content/browser/accessibility/renderer_accessibility_browsertest.cc',
         '../content/browser/child_process_security_policy_browsertest.cc',
         '../content/browser/device_orientation/device_orientation_browsertest.cc',
@@ skipping 40 matching lines @@
             'python',
             '<@(_inputs)',
             'webui',
             '<(RULE_INPUT_PATH)',
             'chrome/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).js',
             '<@(_outputs)',
           ],
         },
       ],
       'conditions': [
-        ['disable_nacl!=1', {
+        ['disable_nacl==0', {
           'sources':[
             'browser/extensions/extension_nacl_browsertest.cc',
           ],
+          'conditions': [
+            ['disable_nacl_untrusted==0', {
+              'dependencies': [
+              '../ppapi/ppapi_untrusted.gyp:ppapi_nacl_tests',
+              ],
+            }],
+          ],
         }],
         ['chromeos==0', {
           'sources/': [
             ['exclude', '^browser/chromeos'],
           ],
           'sources!': [
             'browser/chromeos/extensions/file_browser_private_apitest.cc',
             'browser/chromeos/media/media_player_browsertest.cc',
             'browser/extensions/extension_input_method_apitest.cc',
             'browser/extensions/api/terminal/terminal_private_apitest.cc',
@@ skipping 1747 matching lines @@
               # Use outputs of this action as inputs for the main target build.
               # Seems as a misnomer but makes this happy on Linux (scons).
               'process_outputs_as_sources': 1,
             },
           ],  # 'actions'
         },
       ]
     }],  # 'coverage!=0'
   ],  # 'conditions'
 }