Merge from Chromium at DEPS revision r202854
This commit was generated by merge_to_master.py.
Change-Id: Idca323f71ef844a9e04f454d4f070b1e398f2deb
diff --git a/ppapi/ppapi_tests.gypi b/ppapi/ppapi_tests.gypi
index ffd577f..0d17f37 100644
--- a/ppapi/ppapi_tests.gypi
+++ b/ppapi/ppapi_tests.gypi
@@ -101,6 +101,8 @@
'proxy/resource_message_test_sink.h',
'shared_impl/test_globals.cc',
'shared_impl/test_globals.h',
+ 'shared_impl/unittest_utils.cc',
+ 'shared_impl/unittest_utils.h',
],
},
@@ -121,6 +123,14 @@
'proxy/ppapi_perftests.cc',
'proxy/ppp_messaging_proxy_perftest.cc',
],
+ 'conditions': [
+ # See http://crbug.com/162998#c4 for why this is needed.
+ ['OS=="linux" and linux_use_tcmalloc==1', {
+ 'dependencies': [
+ '../base/allocator/allocator.gyp:allocator',
+ ],
+ }],
+ ],
},
{
'target_name': 'ppapi_unittests',
@@ -461,6 +471,16 @@
],
},
{
+ 'target_name': 'ppapi_example_video_effects',
+ 'dependencies': [
+ 'ppapi_example_skeleton',
+ 'ppapi.gyp:ppapi_cpp',
+ ],
+ 'sources': [
+ 'examples/video_effects/video_effects.cc',
+ ],
+ },
+ {
'target_name': 'ppapi_example_enumerate_devices',
'dependencies': [
'ppapi_example_skeleton',