| Index: content/content_tests.gypi
|
| diff --git a/content/content_tests.gypi b/content/content_tests.gypi
|
| index 2568fafe52995f747d1bbaa9c653dc6f31bba5f8..3eb88bea0f5101c4bde8e2670ee2818c1038babc 100644
|
| --- a/content/content_tests.gypi
|
| +++ b/content/content_tests.gypi
|
| @@ -923,6 +923,27 @@
|
| ],
|
| },
|
| {
|
| + 'target_name': 'web_ui_test_mojo_bindings',
|
| + 'type': 'static_library',
|
| + 'dependencies': [
|
| + '../mojo/mojo.gyp:mojo_bindings',
|
| + '../mojo/mojo.gyp:mojo_system',
|
| + ],
|
| + 'sources': [
|
| + 'test/data/web_ui_test_mojo_bindings.mojom',
|
| + ],
|
| + # TODO(sky): this shouldn't be necessary. It's working around a bug in
|
| + # gyp.
|
| + 'variables': {
|
| + 'mojom_base_output_dir': 'content',
|
| + },
|
| + 'includes': [ '../mojo/public/bindings/mojom_bindings_generator.gypi' ],
|
| + 'export_dependent_settings': [
|
| + '../mojo/mojo.gyp:mojo_bindings',
|
| + '../mojo/mojo.gyp:mojo_system',
|
| + ],
|
| + },
|
| + {
|
| 'target_name': 'content_browsertests',
|
| 'type': '<(gtest_target_type)',
|
| 'dependencies': [
|
| @@ -1027,6 +1048,7 @@
|
| 'browser/web_contents/web_contents_impl_browsertest.cc',
|
| 'browser/web_contents/web_contents_view_aura_browsertest.cc',
|
| 'browser/webkit_browsertest.cc',
|
| + 'browser/webui/web_ui_mojo_browsertest.cc',
|
| 'browser/worker_host/test/worker_browsertest.cc',
|
| 'child/site_isolation_policy_browsertest.cc',
|
| 'common/gpu/client/context_provider_command_buffer_browsertest.cc',
|
| @@ -1063,6 +1085,19 @@
|
| 'browser/web_contents/touch_editable_impl_aura_browsertest.cc',
|
| ],
|
| }],
|
| + ['use_mojo==0', {
|
| + 'sources!': [
|
| + 'browser/webui/web_ui_mojo_browsertest.cc',
|
| + ],
|
| + }, { # use_mojo==1
|
| + 'dependencies': [
|
| + 'web_ui_test_mojo_bindings',
|
| + '../mojo/mojo.gyp:mojo_bindings',
|
| + '../mojo/mojo.gyp:mojo_environment_chromium',
|
| + '../mojo/mojo.gyp:mojo_system',
|
| + '../mojo/mojo.gyp:mojo_system_impl',
|
| + ],
|
| + }],
|
| ['OS=="win"', {
|
| 'resource_include_dirs': [
|
| '<(SHARED_INTERMEDIATE_DIR)/webkit',
|
|
|