diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-25 02:23:05 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-25 02:23:05 +0000 |
| commit | 20790a2251838ef5d3f2432ba6f0c9f54e7c7838 (patch) | |
| tree | a54762e7c5803efc7955c709eade6c541c18a804 /content/content_tests.gypi | |
| parent | 64974bea71a5c4cf95e67afef2e121e04af451f4 (diff) | |
| download | chromium_src-20790a2251838ef5d3f2432ba6f0c9f54e7c7838.zip chromium_src-20790a2251838ef5d3f2432ba6f0c9f54e7c7838.tar.gz chromium_src-20790a2251838ef5d3f2432ba6f0c9f54e7c7838.tar.bz2 | |
Move webkit/plugins/ppapi to content/renderer/pepper.
I will change namespaces in a followup as this got very large. Also, I have a temporary dependency from content/common onto content/renderer for PluginModule that I only discovered at the end. I will remove that in a followup.
BUG=263054
R=scottmg@chromium.org
Review URL: https://codereview.chromium.org/20165002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213578 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_tests.gypi')
| -rw-r--r-- | content/content_tests.gypi | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/content/content_tests.gypi b/content/content_tests.gypi index 9e2564d..6f1c0efe 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi @@ -430,10 +430,21 @@ 'renderer/media/video_capture_message_filter_unittest.cc', 'renderer/media/webaudiosourceprovider_impl_unittest.cc', 'renderer/paint_aggregator_unittest.cc', - 'renderer/skia_benchmarking_extension_unittest.cc', + 'renderer/pepper/host_var_tracker_unittest.cc', + 'renderer/pepper/mock_platform_image_2d.cc', + 'renderer/pepper/mock_platform_image_2d.h', + 'renderer/pepper/mock_plugin_delegate.cc', + 'renderer/pepper/mock_plugin_delegate.h', + 'renderer/pepper/mock_resource.h', + 'renderer/pepper/ppapi_plugin_instance_unittest.cc', + 'renderer/pepper/ppapi_unittest.cc', + 'renderer/pepper/ppapi_unittest.h', + 'renderer/pepper/quota_file_io_unittest.cc', + 'renderer/pepper/v8_var_converter_unittest.cc', 'renderer/pepper/pepper_broker_impl_unittest.cc', 'renderer/render_thread_impl_unittest.cc', 'renderer/render_view_impl_unittest.cc', + 'renderer/skia_benchmarking_extension_unittest.cc', 'renderer/v8_value_converter_impl_unittest.cc', 'renderer/webplugin_impl_unittest.cc', 'test/image_decoder_test.cc', @@ -531,17 +542,6 @@ '../webkit/mocks/mock_weburlloader.cc', '../webkit/mocks/mock_weburlloader.h', '../webkit/common/user_agent/user_agent_unittest.cc', - '../webkit/plugins/ppapi/host_var_tracker_unittest.cc', - '../webkit/plugins/ppapi/mock_platform_image_2d.cc', - '../webkit/plugins/ppapi/mock_platform_image_2d.h', - '../webkit/plugins/ppapi/mock_plugin_delegate.cc', - '../webkit/plugins/ppapi/mock_plugin_delegate.h', - '../webkit/plugins/ppapi/mock_resource.h', - '../webkit/plugins/ppapi/ppapi_plugin_instance_unittest.cc', - '../webkit/plugins/ppapi/ppapi_unittest.cc', - '../webkit/plugins/ppapi/ppapi_unittest.h', - '../webkit/plugins/ppapi/quota_file_io_unittest.cc', - '../webkit/plugins/ppapi/v8_var_converter_unittest.cc', '../webkit/browser/quota/mock_quota_manager.cc', '../webkit/browser/quota/mock_quota_manager.h', '../webkit/browser/quota/mock_quota_manager_unittest.cc', @@ -848,6 +848,10 @@ 'renderer/dom_serializer_browsertest.cc', 'renderer/mouse_lock_dispatcher_browsertest.cc', 'renderer/password_form_conversion_utils_browsertest.cc', + 'renderer/pepper/mock_platform_image_2d.cc', + 'renderer/pepper/mock_platform_image_2d.h', + 'renderer/pepper/mock_plugin_delegate.cc', + 'renderer/pepper/mock_plugin_delegate.h', 'renderer/pepper/mock_renderer_ppapi_host.cc', 'renderer/pepper/pepper_device_enumeration_host_helper_unittest.cc', 'renderer/pepper/pepper_file_chooser_host_unittest.cc', @@ -868,10 +872,6 @@ 'test/content_browser_test_utils_mac.mm', 'test/content_browser_test_test.cc', 'test/content_test_launcher.cc', - '../webkit/plugins/ppapi/mock_platform_image_2d.cc', - '../webkit/plugins/ppapi/mock_platform_image_2d.h', - '../webkit/plugins/ppapi/mock_plugin_delegate.cc', - '../webkit/plugins/ppapi/mock_plugin_delegate.h', '../webkit/renderer/cpp_binding_example.cc', '../webkit/renderer/cpp_binding_example.h', ], @@ -969,12 +969,12 @@ ], }], ['enable_plugins==0', { + 'sources/': [ + ['exclude', '^renderer/pepper/'], + ], 'sources!': [ 'browser/plugin_service_impl_browsertest.cc', 'browser/plugin_data_remover_impl_browsertest.cc', - 'renderer/pepper/pepper_device_enumeration_host_helper_unittest.cc', - 'renderer/pepper/pepper_file_chooser_host_unittest.cc', - 'renderer/pepper/pepper_graphics_2d_host_unittest.cc', ], }], ['enable_pepper_cdms==1', { |