Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(251)

Unified Diff: content/content_tests.gypi

Issue 206923002: Adds plumbing to pass WebUI mojo::Handle from browser to renderer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge 2 trunk Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/content_tests.gypi
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 9ff409a00d97ec28222693108d5d37655a209d08..eba1c02ffa5d415ab53c4c06b1e2e2c7e5aca6c6 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -920,6 +920,22 @@
],
},
{
+ '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',
+ ],
+ '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': [
@@ -1024,6 +1040,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',
@@ -1060,6 +1077,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',

Powered by Google App Engine
This is Rietveld 408576698