Index: content/content_tests.gypi |
diff --git a/content/content_tests.gypi b/content/content_tests.gypi |
index 1dd6d8f549a19cfeed17a1561e45e4cd071f7f22..059209f695dc12d639dc7aa35a45d0b5f2e017cb 100644 |
--- a/content/content_tests.gypi |
+++ b/content/content_tests.gypi |
@@ -16,9 +16,9 @@ |
['OS!="ios"', { |
# layouttest_support_content is not supported nor required on iOS. |
'dependencies': [ |
+ 'webkit_test_support_content', |
'../skia/skia.gyp:skia', |
'../v8/tools/gyp/v8.gyp:v8', |
- '../webkit/common/webkit_common.gyp:webkit_common', |
], |
'include_dirs': [ |
'..', |
@@ -60,6 +60,7 @@ |
'content.gyp:content_app_both', |
'content.gyp:content_browser', |
'content.gyp:content_common', |
+ 'webkit_test_support_content', |
], |
'include_dirs': [ |
'..', |
@@ -203,6 +204,16 @@ |
'test/weburl_loader_mock_factory.h', |
], |
'conditions': [ |
+ ['enable_plugins==0', { |
+ 'sources!': [ |
+ 'test/ppapi_unittest.cc', |
+ ], |
+ }], |
+ ['input_speech==0', { |
+ 'sources!': [ |
+ 'test/mock_google_streaming_server.cc', |
+ ], |
+ }], |
['OS == "ios"', { |
'sources/': [ |
# iOS only needs a small portion of content; exclude all the |
@@ -249,6 +260,7 @@ |
'../ppapi/ppapi_internal.gyp:ppapi_unittest_shared', |
'../third_party/WebKit/public/blink.gyp:blink', |
'../ui/surface/surface.gyp:surface', |
+ '../v8/tools/gyp/v8.gyp:v8', |
'../webkit/child/webkit_child.gyp:webkit_child', |
'../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu', |
'../webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support', |
@@ -315,6 +327,23 @@ |
], |
}, |
{ |
+ 'target_name': 'webkit_test_support_content', |
+ 'type': 'static_library', |
+ 'dependencies': [ |
+ '../webkit/common/webkit_common.gyp:webkit_common', |
+ ], |
+ 'include_dirs': [ |
+ '..', |
+ ], |
+ 'export_dependent_settings': [ |
+ '../webkit/common/webkit_common.gyp:webkit_common', |
+ ], |
+ 'sources': [ |
+ '../webkit/browser/quota/mock_special_storage_policy.cc', |
+ '../webkit/browser/quota/mock_special_storage_policy.h', |
+ ], |
+ }, |
+ { |
'target_name': 'content_unittests', |
'type': '<(gtest_target_type)', |
'dependencies': [ |
@@ -662,8 +691,6 @@ |
'../webkit/common/database/database_connections_unittest.cc', |
'../webkit/common/database/database_identifier_unittest.cc', |
'../webkit/common/fileapi/file_system_util_unittest.cc', |
- '../webkit/browser/quota/mock_special_storage_policy.cc', |
- '../webkit/browser/quota/mock_special_storage_policy.h', |
], |
'conditions': [ |
['OS == "ios"', { |
@@ -698,8 +725,6 @@ |
'../third_party/libjingle/libjingle.gyp:libjingle', |
'../ui/compositor/compositor.gyp:compositor_test_support', |
'../ui/gl/gl.gyp:gl', |
- '../v8/tools/gyp/v8.gyp:v8', |
- '../webkit/common/webkit_common.gyp:webkit_common', |
'../webkit/child/webkit_child.gyp:webkit_child', |
'../webkit/storage_browser.gyp:webkit_storage_browser', |
'../webkit/storage_common.gyp:webkit_storage_common', |
@@ -1270,11 +1295,12 @@ |
'../testing/gtest.gyp:gtest', |
'../third_party/WebKit/public/blink.gyp:blink', |
'../ui/base/ui_base.gyp:ui_base', |
+ '../v8/tools/gyp/v8.gyp:v8', |
'../ui/gfx/gfx.gyp:gfx', |
'../ui/gfx/gfx.gyp:gfx_geometry', |
'../ui/gl/gl.gyp:gl', |
- # The following two dependencies provide the missing |
- # symbol HeapProfilerStart in Linux component builds. |
+ # The following dependency provides the missing symbol |
+ # HeapProfilerStart in Linux component builds. |
'../webkit/child/webkit_child.gyp:webkit_child', |
], |
'include_dirs': [ |