diff options
| -rw-r--r-- | chrome/chrome.gyp | 41 |
1 files changed, 5 insertions, 36 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 03ffe40..e0a5454 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -2757,13 +2757,13 @@ 'renderer/mock_keyboard.h', 'renderer/mock_keyboard_driver_win.cc', 'renderer/mock_keyboard_driver_win.h', + 'renderer/mock_render_process.h', + 'renderer/mock_render_thread.cc', + 'renderer/mock_render_thread.h', 'renderer/mock_printer.cc', 'renderer/mock_printer.h', 'renderer/mock_printer_driver_win.cc', 'renderer/mock_printer_driver_win.h', - 'renderer/mock_render_process.h', - 'renderer/mock_render_thread.cc', - 'renderer/mock_render_thread.h', 'test/automation/autocomplete_edit_proxy.cc', 'test/automation/autocomplete_edit_proxy.h', 'test/automation/automation_constants.h', @@ -3603,6 +3603,7 @@ 'target_name': 'perf_tests', 'type': 'executable', 'msvs_guid': '9055E088-25C6-47FD-87D5-D9DD9FD75C9F', + 'msvs_existing_vcproj': 'test/perf/perftests.vcproj', 'dependencies': [ 'browser', 'common', @@ -3617,10 +3618,7 @@ '../webkit/webkit.gyp:glue', ], 'sources': [ - 'browser/safe_browsing/database_perftest.cc', - 'browser/safe_browsing/filter_false_positive_perftest.cc', 'browser/visitedlink_perftest.cc', - 'common/json_value_serializer_perftest.cc', 'test/perf/perftests.cc', 'test/perf/url_parse_perftest.cc', ], @@ -3631,7 +3629,6 @@ ], 'sources!': [ # TODO(port): - 'browser/safe_browsing/filter_false_positive_perftest.cc', 'browser/visitedlink_perftest.cc', ], }], @@ -4142,11 +4139,11 @@ 'target_name': 'interactive_ui_tests', 'type': 'executable', 'msvs_guid': '018D4F38-6272-448F-A864-976DA09F05D0', + 'msvs_existing_vcproj': 'test/interactive_ui/interactive_ui.vcproj', 'dependencies': [ 'chrome_resources', 'chrome_strings', 'debugger', - 'installer/installer.gyp:installer_util_strings', 'test_support_common', 'test_support_ui', 'third_party/hunspell/hunspell.gyp:hunspell', @@ -4168,7 +4165,6 @@ ], 'sources': [ 'browser/browser_focus_uitest.cc', - 'browser/debugger/devtools_sanity_unittest.cc', 'browser/views/bookmark_bar_view_test.cc', 'browser/views/constrained_window_impl_interactive_uitest.cc', 'browser/views/find_bar_win_interactive_uitest.cc', @@ -4176,33 +4172,6 @@ 'test/interactive_ui/npapi_interactive_test.cc', 'test/interactive_ui/view_event_test_base.cc', 'test/interactive_ui/view_event_test_base.h', - - # Windows-only below here, will need addressing if/when - # this gets ported. - '../webkit/glue/resources/aliasb.cur', - '../webkit/glue/resources/cell.cur', - '../webkit/glue/resources/col_resize.cur', - '../webkit/glue/resources/copy.cur', - '../webkit/glue/resources/row_resize.cur', - '../webkit/glue/resources/vertical_text.cur', - '../webkit/glue/resources/zoom_in.cur', - '../webkit/glue/resources/zoom_out.cur', - - 'app/chrome_dll.rc', - 'test/data/resource.rc', - - # TODO: It would be nice to have these pulled in - # automatically from direct_dependent_settings in - # their various targets (net.gyp:net_resources, etc.), - # but that causes errors in other targets when - # resulting .res files get referenced multiple times. - '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', - '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', - '<(SHARED_INTERMEDIATE_DIR)/chrome/debugger_resources.rc', - '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', - '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', - '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', - 'tools/build/win/precompiled_wtl.h', 'tools/build/win/precompiled_wtl.cc', ], |