Revert "Revert 69755 - Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi"

webkit/tools/test_shell/test_shell.gypi

 # Copyright (c) 2010 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': {
     'test_shell_windows_resource_files': [
       'resources/test_shell.rc',
       'resources/pan_east.cur',
       'resources/pan_middle.cur',
@@ skipping 382 matching lines @@
         '../../glue/cpp_variant_unittest.cc',
         '../../glue/dom_operations_unittest.cc',
         '../../glue/dom_serializer_unittest.cc',
         '../../glue/glue_serialize_unittest.cc',
         '../../glue/iframe_redirect_unittest.cc',
         '../../glue/media/buffered_data_source_unittest.cc',
         '../../glue/media/buffered_resource_loader_unittest.cc',
         '../../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',
         '../../glue/webcursor_unittest.cc',
         '../../glue/webframe_unittest.cc',
         '../../glue/webkit_glue_unittest.cc',
         '../../glue/webpasswordautocompletelistener_unittest.cc',
         '../../glue/webview_unittest.cc',
         '../../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',
         'image_decoder_unittest.cc',
         'image_decoder_unittest.h',
         'layout_test_controller_unittest.cc',
         'listener_leak_test.cc',
         'media_leak_test.cc',
         'mock_spellcheck_unittest.cc',
         'node_leak_test.cc',
@@ skipping 72 matching lines @@
     ['target_arch!="x64" and target_arch!="arm"', {
       'targets': [
         {
           'target_name': 'npapi_test_common',
           'type': 'static_library',
           'dependencies': [
             '<(DEPTH)/base/base.gyp:base',
             '<(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',
           ],
         },
         {
           'target_name': 'npapi_test_plugin',
           'type': 'loadable_module',
           'variables': {
             'chromium_code': 1,
           },
           'mac_bundle': 1,
           'msvs_guid': '0D04AEC1-6B68-492C-BCCF-808DFD69ABC6',
           'dependencies': [
             '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
             '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"', {
               'sources!': [
                 # 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"', {
               'product_extension': 'plugin',
               'link_settings': {
                 'libraries': [
                   '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
                 ],
               },
             }],
             ['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")', {
               # Shared libraries need -fPIC on x86-64
               'cflags': ['-fPIC']
             }],
           ],
         },
         {
           'target_name': 'copy_npapi_test_plugin',
@@ skipping 179 matching lines @@
       ],
     }],
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: