Revert 86572 - Revert 86568 - Add initial framework for performance tests that measure frame rate.

chrome/chrome_tests.gypi

 # Copyright (c) 2011 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',
@@ skipping 2862 matching lines @@
           ],
         }],
         ['toolkit_views==1', {
           'dependencies': [
             '../views/views.gyp:views',
           ],
         }],
       ],
     },
     {
+      'target_name': 'performance_ui_tests',
+      'type': 'executable',
+      'msvs_guid': 'C3539D2F-B87A-4F9B-8220-1BB5F7119720',
+      'dependencies': [
+        'chrome',
+        'chrome_resources',
+        'chrome_strings',
+        'debugger',
+        'test_support_common',
+        'test_support_ui',
+        '../base/base.gyp:base',
+        '../skia/skia.gyp:skia',
+        '../testing/gtest.gyp:gtest',
+      ],
+      'sources': [
+        # TODO(darin): Move other UIPerfTests here.
+        'test/perf/frame_rate/frame_rate_tests.cc',
+      ],
+      'conditions': [
+        ['OS=="win" and buildtype=="Official"', {
+          'configurations': {
+            'Release': {
+              'msvs_settings': {
+                'VCCLCompilerTool': {
+                  'WholeProgramOptimization': 'false',
+                },
+              },
+            },
+          },
+        },],
+        ['OS=="linux"', {
+          'dependencies': [
+            '../build/linux/system.gyp:gtk',
+            '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
+          ],
+        }],
+        ['toolkit_views==1', {
+          'dependencies': [
+            '../views/views.gyp:views',
+          ],
+        }],
+      ],
+    },
+    {
       'target_name': 'tab_switching_test',
       'type': 'executable',
       'msvs_guid': 'A34770EA-A574-43E8-9327-F79C04770E98',
       'run_as': {
         'action': ['$(TargetPath)', '--gtest_print_time'],
       },
       'dependencies': [
         'chrome',
         'debugger',
         'test_support_common',
@@ skipping 1096 matching lines @@
       ]
     }],  # 'coverage!=0'
   ],  # 'conditions'
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: