Recommit the generate profile patch

chrome/chrome_tests.gypi

 # Copyright 2013 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 15 matching lines @@
           'test/pyautolib/asan_stub.c',
         ]
       }],
     ],
   },
   'includes': [
     'js_unittest_vars.gypi',
   ],
   'targets': [
     {
+      'target_name': 'test_support_ui_runner',
+      'type': 'static_library',
+      'dependencies': [
+        'test_support_common',
+        '../testing/gtest.gyp:gtest',
+      ],
+      'export_dependent_settings': [
+        'test_support_common',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+      'sources': [
+        'test/ui/run_all_unittests.cc',
+      ],
+    },
+    {
       'target_name': 'test_support_ui',
       'type': 'static_library',
       'dependencies': [
         'chrome_resources.gyp:chrome_resources',
         'chrome_resources.gyp:chrome_strings',
         'chrome_resources.gyp:theme_resources',
         'test_support_common',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
       ],
@@ skipping 39 matching lines @@
     },
     {
       'target_name': 'automated_ui_tests',
       'type': 'executable',
       'dependencies': [
         'browser',
         'chrome_resources.gyp:theme_resources',
         'renderer',
         'test_support_common',
         'test_support_ui',
+        'test_support_ui_runner',
         '../base/base.gyp:base',
         '../skia/skia.gyp:skia',
         '../third_party/libxml/libxml.gyp:libxml',
         '../testing/gtest.gyp:gtest',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'test/reliability/automated_ui_tests.cc',
@@ skipping 401 matching lines @@
       'target_name': 'chromedriver_lib',
       'type': 'static_library',
       'dependencies': [
         'browser',
         'chrome',
         'chrome_resources.gyp:chrome_resources',
         'chrome_resources.gyp:chrome_strings',
         'chromedriver_support',
         'common',
         'test_support_ui',
+        'test_support_ui_runner',
         '../base/base.gyp:base',
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../net/net.gyp:net',
         '../skia/skia.gyp:skia',
         '../sync/sync.gyp:sync',
         '../testing/gtest.gyp:gtest',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/libxml/libxml.gyp:libxml',
       ],
@@ skipping 1709 matching lines @@
       #   b) Run with CHROME_HEADLESS=1 to generate crash dumps.
       #   c) Strip the binary if it's a debug build. (binary may be over 2GB)
       'target_name': 'reliability_tests',
       'type': 'executable',
       'dependencies': [
         'browser',
         'chrome',
         'chrome_resources.gyp:theme_resources',
         'test_support_common',
         'test_support_ui',
+        'test_support_ui_runner',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
         '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'test/reliability/page_load_test.cc',
       ],
@@ skipping 50 matching lines @@
         'test_support_ui',
         '../base/base.gyp:base',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
       ],
       'sources': [
         # TODO(darin): Move other UIPerfTests here.
         'test/perf/dom_checker_uitest.cc',
         'test/perf/feature_startup_test.cc',
         'test/perf/frame_rate/frame_rate_tests.cc',
+        'test/perf/generate_profile.cc',
+        'test/perf/generate_profile.h',
         'test/perf/indexeddb_uitest.cc',
         'test/perf/memory_test.cc',
         'test/perf/page_cycler_test.cc',
+        'test/perf/perf_ui_test_suite.cc',
+        'test/perf/run_all_perfuitests.cc',
         'test/perf/shutdown_test.cc',
         'test/perf/startup_test.cc',
         'test/perf/tab_switching_test.cc',
         'test/perf/url_fetch_test.cc',
       ],
       'conditions': [
         ['OS=="win" and buildtype=="Official"', {
           'configurations': {
             'Release': {
               'msvs_settings': {
@@ skipping 552 matching lines @@
           'sources': [
             'test/security_tests/ipc_security_tests.cc',
             'test/security_tests/ipc_security_tests.h',
             'test/security_tests/security_tests.cc',
             '../sandbox/win/tests/validation_tests/commands.cc',
             '../sandbox/win/tests/validation_tests/commands.h',
           ],
         },
       ]},  # 'targets'
     ],  # OS=="win"
-    ['OS=="linux" or OS=="win"', {
-      'targets': [
-        {
-          'target_name': 'generate_profile',
-          'type': 'executable',
-          'dependencies': [
-            'test_support_common',
-            'browser',
-            'renderer',
-            'chrome_resources.gyp:packed_resources',
-            '../base/base.gyp:base',
-            '../net/net.gyp:net_test_support',
-            '../skia/skia.gyp:skia',
-            '../sync/sync.gyp:sync',
-          ],
-          'include_dirs': [
-            '..',
-          ],
-          'sources': [
-            'tools/profiles/generate_profile.cc',
-            'tools/profiles/thumbnail-inl.h',
-          ],
-          'conditions': [
-            ['OS=="win"', {
-              'conditions': [
-                ['win_use_allocator_shim==1', {
-                  'dependencies': [
-                    '<(allocator_target)',
-                  ],
-                }],
-              ],
-              'configurations': {
-                'Debug_Base': {
-                  'msvs_settings': {
-                    'VCLinkerTool': {
-                      'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
-                    },
-                  },
-                },
-              },
-            }],
-          ],
-        },
-      ]},  # 'targets'
-    ],
     # If you change this condition, make sure you also change it in all.gyp
     # for the chromium_builder_qa target.
     ['enable_automation==1 and (OS=="mac" or ((OS=="win" or os_posix==1) and target_arch==python_arch))', {
       'targets': [
         {
           # Documentation: http://dev.chromium.org/developers/testing/pyauto
           'target_name': 'pyautolib',
           'type': 'loadable_module',
           'product_prefix': '_',
           'dependencies': [
@@ skipping 474 matching lines @@
               # more details.
               'DebugInformationFormat': '3',
               'ProgramDataBaseFileName': '<(PRODUCT_DIR)/browser_tests.exe.pdb',
             },
           },
         },
       ],
     }],
   ],  # 'conditions'
 }