Index: extensions/shell/app_shell.gyp |
diff --git a/extensions/shell/app_shell.gyp b/extensions/shell/app_shell.gyp |
index f8ef6ef5db9e661d0776528470eb4f28a7a78baa..1666e434edd0fc817f029e450da0492b3c1947ec 100644 |
--- a/extensions/shell/app_shell.gyp |
+++ b/extensions/shell/app_shell.gyp |
@@ -289,74 +289,6 @@ |
}], |
], |
}, |
- |
- { |
- 'target_name': 'app_shell_browsertests', |
- 'type': '<(gtest_target_type)', |
- 'dependencies': [ |
- 'app_shell_lib', |
- # TODO(yoz): find the right deps |
- '<(DEPTH)/base/base.gyp:test_support_base', |
- '<(DEPTH)/components/components.gyp:storage_monitor_test_support', |
- '<(DEPTH)/content/content.gyp:content_app_both', |
- '<(DEPTH)/content/content_shell_and_tests.gyp:content_browser_test_support', |
- '<(DEPTH)/content/content_shell_and_tests.gyp:test_support_content', |
- '<(DEPTH)/extensions/extensions.gyp:extensions_test_support', |
- '<(DEPTH)/testing/gmock.gyp:gmock', |
- '<(DEPTH)/testing/gtest.gyp:gtest', |
- ], |
- 'defines': [ |
- 'HAS_OUT_OF_PROC_TEST_RUNNER', |
- ], |
- 'sources': [ |
- # TODO(yoz): Refactor once we have a second test target. |
- # TODO(yoz): Something is off here; should this .gyp file be |
- # in the parent directory? Test target extensions_browsertests? |
- '../browser/api/audio/audio_apitest.cc', |
- '../browser/api/dns/dns_apitest.cc', |
- '../browser/api/hid/hid_apitest.cc', |
- '../browser/api/printer_provider/printer_provider_apitest.cc', |
- '../browser/api/socket/socket_apitest.cc', |
- '../browser/api/sockets_tcp/sockets_tcp_apitest.cc', |
- '../browser/api/sockets_tcp_server/sockets_tcp_server_apitest.cc', |
- '../browser/api/sockets_udp/sockets_udp_apitest.cc', |
- '../browser/api/system_cpu/system_cpu_apitest.cc', |
- '../browser/api/system_display/system_display_apitest.cc', |
- '../browser/api/system_memory/system_memory_apitest.cc', |
- '../browser/api/system_network/system_network_apitest.cc', |
- '../browser/api/system_storage/storage_api_test_util.cc', |
- '../browser/api/system_storage/storage_api_test_util.h', |
- '../browser/api/system_storage/system_storage_apitest.cc', |
- '../browser/api/system_storage/system_storage_eject_apitest.cc', |
- '../browser/api/usb/usb_apitest.cc', |
- '../browser/guest_view/app_view/app_view_apitest.cc', |
- '../browser/guest_view/web_view/web_view_apitest.h', |
- '../browser/guest_view/web_view/web_view_apitest.cc', |
- '../browser/guest_view/web_view/web_view_media_access_apitest.cc', |
- '../browser/updater/update_service_browsertest.cc', |
- 'browser/geolocation/geolocation_apitest.cc', |
- 'browser/shell_browsertest.cc', |
- 'test/shell_apitest.cc', |
- 'test/shell_apitest.h', |
- 'test/shell_test.cc', |
- 'test/shell_test.h', |
- 'test/shell_test_launcher_delegate.cc', |
- 'test/shell_test_launcher_delegate.h', |
- 'test/shell_tests_main.cc', |
- ], |
- 'conditions': [ |
- ['OS=="win" and win_use_allocator_shim==1', { |
- 'dependencies': [ |
- '<(DEPTH)/base/allocator/allocator.gyp:allocator', |
- ], |
- }], |
- ['OS=="mac"', { |
- 'dependencies': [ |
- 'app_shell', # Needed for App Shell.app's Helper. |
- ], |
- }], |
- ], |
- }, |
{ |
'target_name': 'app_shell_unittests', |
'type': 'executable', |