Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(684)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webkit/tools/test_shell/test_shell.gypi

Issue 5996003: Revert "Revert 69755 - Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/tools/test_shell/test_shell.cc ('k') | webkit/tools/test_shell/test_shell_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/tools/test_shell/test_shell.gypi
diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi
index bec7e53b204f46858fc1f97bff904b6baaadd334..9ebd278a26d067e89b4bfa67a5b6fd7e2afee640 100644
--- a/webkit/tools/test_shell/test_shell.gypi
+++ b/webkit/tools/test_shell/test_shell.gypi
@@ -400,10 +400,6 @@
'../../glue/media/simple_data_source_unittest.cc',
'../../glue/mimetype_unittest.cc',
'../../glue/multipart_response_delegate_unittest.cc',
- '../../glue/plugins/plugin_group_unittest.cc',
- '../../glue/plugins/plugin_lib_unittest.cc',
- '../../glue/plugins/url_request_info_unittest.cc',
- '../../glue/plugins/webplugin_impl_unittest.cc',
'../../glue/regular_expression_unittest.cc',
'../../glue/resource_fetcher_unittest.cc',
'../../glue/unittest_test_server.h',
@@ -415,12 +411,18 @@
'../../mocks/mock_resource_loader_bridge.h',
'../../mocks/mock_webframe.h',
'../../mocks/mock_weburlloader.h',
+ '../../plugins/npapi/plugin_group_unittest.cc',
+ '../../plugins/npapi/plugin_group_unittest.cc',
+ '../../plugins/npapi/plugin_lib_unittest.cc',
+ '../../plugins/npapi/plugin_lib_unittest.cc',
+ '../../plugins/npapi/webplugin_impl_unittest.cc',
'../../plugins/ppapi/mock_plugin_delegate.cc',
'../../plugins/ppapi/mock_plugin_delegate.h',
'../../plugins/ppapi/mock_resource.h',
'../../plugins/ppapi/ppapi_unittest.cc',
'../../plugins/ppapi/ppapi_unittest.h',
'../../plugins/ppapi/resource_tracker_unittest.cc',
+ '../../plugins/ppapi/url_request_info_unittest.cc',
'../webcore_unit_tests/BMPImageDecoder_unittest.cpp',
'../webcore_unit_tests/ICOImageDecoder_unittest.cpp',
'event_listener_unittest.cc',
@@ -513,13 +515,13 @@
'<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
],
'sources': [
- '../../glue/plugins/test/npapi_constants.cc',
- '../../glue/plugins/test/npapi_constants.h',
- '../../glue/plugins/test/plugin_client.cc',
- '../../glue/plugins/test/plugin_client.h',
- '../../glue/plugins/test/plugin_test.cc',
- '../../glue/plugins/test/plugin_test.h',
- '../../glue/plugins/test/plugin_test_factory.h',
+ '../../plugins/npapi/test/npapi_constants.cc',
+ '../../plugins/npapi/test/npapi_constants.h',
+ '../../plugins/npapi/test/plugin_client.cc',
+ '../../plugins/npapi/test/plugin_client.h',
+ '../../plugins/npapi/test/plugin_test.cc',
+ '../../plugins/npapi/test/plugin_test.h',
+ '../../plugins/npapi/test/plugin_test_factory.h',
],
},
{
@@ -535,51 +537,51 @@
'npapi_test_common',
],
'sources': [
- '../../glue/plugins/test/npapi_test.cc',
- '../../glue/plugins/test/npapi_test.def',
- '../../glue/plugins/test/npapi_test.rc',
- '../../glue/plugins/test/plugin_arguments_test.cc',
- '../../glue/plugins/test/plugin_arguments_test.h',
- '../../glue/plugins/test/plugin_create_instance_in_paint.cc',
- '../../glue/plugins/test/plugin_create_instance_in_paint.h',
- '../../glue/plugins/test/plugin_delete_plugin_in_stream_test.cc',
- '../../glue/plugins/test/plugin_delete_plugin_in_stream_test.h',
- '../../glue/plugins/test/plugin_get_javascript_url_test.cc',
- '../../glue/plugins/test/plugin_get_javascript_url_test.h',
- '../../glue/plugins/test/plugin_get_javascript_url2_test.cc',
- '../../glue/plugins/test/plugin_get_javascript_url2_test.h',
- '../../glue/plugins/test/plugin_geturl_test.cc',
- '../../glue/plugins/test/plugin_geturl_test.h',
- '../../glue/plugins/test/plugin_javascript_open_popup.cc',
- '../../glue/plugins/test/plugin_javascript_open_popup.h',
- '../../glue/plugins/test/plugin_new_fails_test.cc',
- '../../glue/plugins/test/plugin_new_fails_test.h',
- '../../glue/plugins/test/plugin_npobject_lifetime_test.cc',
- '../../glue/plugins/test/plugin_npobject_lifetime_test.h',
- '../../glue/plugins/test/plugin_npobject_proxy_test.cc',
- '../../glue/plugins/test/plugin_npobject_proxy_test.h',
- '../../glue/plugins/test/plugin_schedule_timer_test.cc',
- '../../glue/plugins/test/plugin_schedule_timer_test.h',
- '../../glue/plugins/test/plugin_setup_test.cc',
- '../../glue/plugins/test/plugin_setup_test.h',
- '../../glue/plugins/test/plugin_thread_async_call_test.cc',
- '../../glue/plugins/test/plugin_thread_async_call_test.h',
- '../../glue/plugins/test/plugin_windowed_test.cc',
- '../../glue/plugins/test/plugin_windowed_test.h',
- '../../glue/plugins/test/plugin_private_test.cc',
- '../../glue/plugins/test/plugin_private_test.h',
- '../../glue/plugins/test/plugin_test_factory.cc',
- '../../glue/plugins/test/plugin_window_size_test.cc',
- '../../glue/plugins/test/plugin_window_size_test.h',
- '../../glue/plugins/test/plugin_windowless_test.cc',
- '../../glue/plugins/test/plugin_windowless_test.h',
- '../../glue/plugins/test/resource.h',
+ '../../plugins/npapi/test/npapi_test.cc',
+ '../../plugins/npapi/test/npapi_test.def',
+ '../../plugins/npapi/test/npapi_test.rc',
+ '../../plugins/npapi/test/plugin_arguments_test.cc',
+ '../../plugins/npapi/test/plugin_arguments_test.h',
+ '../../plugins/npapi/test/plugin_create_instance_in_paint.cc',
+ '../../plugins/npapi/test/plugin_create_instance_in_paint.h',
+ '../../plugins/npapi/test/plugin_delete_plugin_in_stream_test.cc',
+ '../../plugins/npapi/test/plugin_delete_plugin_in_stream_test.h',
+ '../../plugins/npapi/test/plugin_get_javascript_url_test.cc',
+ '../../plugins/npapi/test/plugin_get_javascript_url_test.h',
+ '../../plugins/npapi/test/plugin_get_javascript_url2_test.cc',
+ '../../plugins/npapi/test/plugin_get_javascript_url2_test.h',
+ '../../plugins/npapi/test/plugin_geturl_test.cc',
+ '../../plugins/npapi/test/plugin_geturl_test.h',
+ '../../plugins/npapi/test/plugin_javascript_open_popup.cc',
+ '../../plugins/npapi/test/plugin_javascript_open_popup.h',
+ '../../plugins/npapi/test/plugin_new_fails_test.cc',
+ '../../plugins/npapi/test/plugin_new_fails_test.h',
+ '../../plugins/npapi/test/plugin_npobject_lifetime_test.cc',
+ '../../plugins/npapi/test/plugin_npobject_lifetime_test.h',
+ '../../plugins/npapi/test/plugin_npobject_proxy_test.cc',
+ '../../plugins/npapi/test/plugin_npobject_proxy_test.h',
+ '../../plugins/npapi/test/plugin_schedule_timer_test.cc',
+ '../../plugins/npapi/test/plugin_schedule_timer_test.h',
+ '../../plugins/npapi/test/plugin_setup_test.cc',
+ '../../plugins/npapi/test/plugin_setup_test.h',
+ '../../plugins/npapi/test/plugin_thread_async_call_test.cc',
+ '../../plugins/npapi/test/plugin_thread_async_call_test.h',
+ '../../plugins/npapi/test/plugin_windowed_test.cc',
+ '../../plugins/npapi/test/plugin_windowed_test.h',
+ '../../plugins/npapi/test/plugin_private_test.cc',
+ '../../plugins/npapi/test/plugin_private_test.h',
+ '../../plugins/npapi/test/plugin_test_factory.cc',
+ '../../plugins/npapi/test/plugin_window_size_test.cc',
+ '../../plugins/npapi/test/plugin_window_size_test.h',
+ '../../plugins/npapi/test/plugin_windowless_test.cc',
+ '../../plugins/npapi/test/plugin_windowless_test.h',
+ '../../plugins/npapi/test/resource.h',
],
'include_dirs': [
'../../..',
],
'xcode_settings': {
- 'INFOPLIST_FILE': '<(DEPTH)/webkit/glue/plugins/test/Info.plist',
+ 'INFOPLIST_FILE': '<(DEPTH)/webkit/plugins/npapi/test/Info.plist',
},
'conditions': [
['OS!="win"', {
@@ -587,16 +589,16 @@
# TODO(port): Port these.
# plugin_npobject_lifetime_test.cc has win32-isms
# (HWND, CALLBACK).
- '../../glue/plugins/test/plugin_npobject_lifetime_test.cc',
+ '../../plugins/npapi/test/plugin_npobject_lifetime_test.cc',
# The window APIs are necessarily platform-specific.
- '../../glue/plugins/test/plugin_window_size_test.cc',
- '../../glue/plugins/test/plugin_windowed_test.cc',
+ '../../plugins/npapi/test/plugin_window_size_test.cc',
+ '../../plugins/npapi/test/plugin_windowed_test.cc',
# Seems windows specific.
- '../../glue/plugins/test/plugin_create_instance_in_paint.cc',
- '../../glue/plugins/test/plugin_create_instance_in_paint.h',
+ '../../plugins/npapi/test/plugin_create_instance_in_paint.cc',
+ '../../plugins/npapi/test/plugin_create_instance_in_paint.h',
# windows-specific resources
- '../../glue/plugins/test/npapi_test.def',
- '../../glue/plugins/test/npapi_test.rc',
+ '../../plugins/npapi/test/npapi_test.def',
+ '../../plugins/npapi/test/npapi_test.rc',
],
}],
['OS=="mac"', {
@@ -610,7 +612,7 @@
['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
'sources!': [
# Needs simple event record type porting
- '../../glue/plugins/test/plugin_windowless_test.cc',
+ '../../plugins/npapi/test/plugin_windowless_test.cc',
],
}],
['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and (target_arch=="x64" or target_arch=="arm")', {
« no previous file with comments | « webkit/tools/test_shell/test_shell.cc ('k') | webkit/tools/test_shell/test_shell_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698