Index: content/content_shell.gypi |
diff --git a/content/content_shell.gypi b/content/content_shell.gypi |
index b50b9e4c3eaf5cd8a40e1d1d63e1d73bdbaa7b71..e0d760ccea6f5ff068cc1c9cd0baefa88f5d97b8 100644 |
--- a/content/content_shell.gypi |
+++ b/content/content_shell.gypi |
@@ -33,7 +33,6 @@ |
'content_shell_resources', |
'content_shell_mojo_bindings', |
'content_test_mojo_bindings', |
- 'copy_test_netscape_plugin', |
'layouttest_support_content', |
'../base/base.gyp:base', |
'../base/base.gyp:base_static', |
@@ -551,104 +550,6 @@ |
], |
}, |
{ |
- 'target_name': 'test_netscape_plugin', |
- 'conditions': [ |
- ['OS != "win" and OS != "mac"', { |
- 'type': 'none', |
- }, { # OS=="win" or OS=="mac" |
- 'type': 'loadable_module', |
- 'sources': [ |
- 'shell/tools/plugin/PluginObject.cpp', |
- 'shell/tools/plugin/PluginObject.h', |
- 'shell/tools/plugin/PluginTest.cpp', |
- 'shell/tools/plugin/PluginTest.h', |
- 'shell/tools/plugin/TestObject.cpp', |
- 'shell/tools/plugin/Tests/EvaluateJSAfterRemovingPluginElement.cpp', |
- 'shell/tools/plugin/Tests/FormValue.cpp', |
- 'shell/tools/plugin/Tests/GetUserAgentWithNullNPPFromNPPNew.cpp', |
- 'shell/tools/plugin/Tests/LeakWindowScriptableObject.cpp', |
- 'shell/tools/plugin/Tests/LogNPPSetWindow.cpp', |
- 'shell/tools/plugin/Tests/NPDeallocateCalledBeforeNPShutdown.cpp', |
- 'shell/tools/plugin/Tests/NPPNewFails.cpp', |
- 'shell/tools/plugin/Tests/NPRuntimeCallsWithNullNPP.cpp', |
- 'shell/tools/plugin/Tests/NPRuntimeObjectFromDestroyedPlugin.cpp', |
- 'shell/tools/plugin/Tests/NPRuntimeRemoveProperty.cpp', |
- 'shell/tools/plugin/Tests/NullNPPGetValuePointer.cpp', |
- 'shell/tools/plugin/Tests/PassDifferentNPPStruct.cpp', |
- 'shell/tools/plugin/Tests/PluginScriptableNPObjectInvokeDefault.cpp', |
- 'shell/tools/plugin/Tests/PluginScriptableObjectOverridesAllProperties.cpp', |
- 'shell/tools/plugin/main.cpp', |
- 'shell/tools/plugin/test_object.h', |
- ], |
- 'include_dirs': [ |
- '<(DEPTH)', |
- '<(DEPTH)/content/shell/tools/plugin/', |
- ], |
- 'dependencies': [ |
- '../base/base.gyp:base', |
- '../third_party/npapi/npapi.gyp:npapi', |
- ], |
- 'conditions': [ |
- ['OS=="mac"', { |
- 'mac_bundle': 1, |
- 'product_extension': 'plugin', |
- 'link_settings': { |
- 'libraries': [ |
- '$(SDKROOT)/System/Library/Frameworks/Carbon.framework', |
- '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework', |
- '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework', |
- ] |
- }, |
- 'xcode_settings': { |
- 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', |
- 'INFOPLIST_FILE': 'shell/tools/plugin/mac/Info.plist', |
- }, |
- }], |
- ['OS=="win"', { |
- 'conditions': [ |
- ['MSVS_VERSION < "2015"', { |
- 'defines': [ |
- # This seems like a hack, but this is what Safari Win does. |
- # Luckily it is no longer needed/allowed with VS 2015. |
- 'snprintf=_snprintf', |
- ], |
- }], |
- ], |
- 'sources': [ |
- 'shell/tools/plugin/win/TestNetscapePlugin.def', |
- 'shell/tools/plugin/win/TestNetscapePlugin.rc', |
- ], |
- # The .rc file requires that the name of the dll is np_test_netscape_plugin.dll. |
- 'product_name': 'np_test_netscape_plugin', |
- # Disable c4267 warnings until we fix size_t to int truncations. |
- 'msvs_disabled_warnings': [ 4267, ], |
- }], |
- ], |
- }], |
- ], |
- }, |
- { |
- 'target_name': 'copy_test_netscape_plugin', |
- 'type': 'none', |
- 'dependencies': [ |
- 'test_netscape_plugin', |
- ], |
- 'conditions': [ |
- ['OS=="win"', { |
- 'copies': [{ |
- 'destination': '<(PRODUCT_DIR)/plugins', |
- 'files': ['<(PRODUCT_DIR)/np_test_netscape_plugin.dll'], |
- }], |
- }], |
- ['OS=="mac"', { |
- 'copies': [{ |
- 'destination': '<(PRODUCT_DIR)/plugins/', |
- 'files': ['<(PRODUCT_DIR)/test_netscape_plugin.plugin/'], |
- }], |
- }], |
- ], |
- }, |
- { |
'target_name': 'content_shell_mojo_bindings_mojom', |
'type': 'none', |
'variables': { |