Mojo bindings: Fix typemap includes.

url/url.gyp

Index: url/url.gyp
diff --git a/url/url.gyp b/url/url.gyp
index 08bb9caeff972baf34fe6a6d574d976ffa4e9abf..9ab87e1a5782420249e085d0bd6fea5001555276 100644
--- a/url/url.gyp
+++ b/url/url.gyp
@@ -72,46 +72,16 @@
       'target_name': 'url_interfaces_mojom',

[Ken Rockot(use gerrit already), 2016/03/22 18:00:10]

nit: Maybe we should rename this target to url_mojom_chromium? Or I guess we
could adopt the convention that no suffix/variant implies chromium variant.

[Sam McNally, 2016/03/22 19:22:03]

I think we're going to default to no suffix/variant implies chromium because of
all the existing mojom targets.

       'type': 'none',
       'variables': {

[Ken Rockot(use gerrit already), 2016/03/22 18:00:10]

Why is this no longer chromium variant? Or is it because we are adopting the
aforementioned convention?

[Sam McNally, 2016/03/22 19:22:03]

It was either this or change all the other mojom targets to the chromium
variant. //content depends on this and this CL adds enforcement (only in GN) of
same-variant mojom dependencies.

-        'mojom_files': [
-          'mojo/origin.mojom',
-          'mojo/url.mojom',
-        ],
-      },
-      'includes': [ '../mojo/mojom_bindings_generator_explicit.gypi' ],
-    },
-    {
-      'target_name': 'url_mojom_chromium',
-      'type': 'none',
-      'variables': {
-        'mojom_variant': 'chromium',
-        'mojom_extra_generator_args': [
-          '--typemap', '<(DEPTH)/url/mojo/gurl.typemap',
-        ],
-        'mojom_files': [
-          'mojo/url.mojom',
-        ],
-      },
-      'includes': [ '../mojo/mojom_bindings_generator_explicit.gypi' ],
-      'dependencies': [
-        'url_interfaces_mojom',
-      ],
-    },
-    {
-      'target_name': 'origin_mojom_chromium',
-      'type': 'none',
-      'variables': {
-        'mojom_variant': 'chromium',
         'mojom_extra_generator_args': [
           '--typemap', '<(DEPTH)/url/mojo/origin.typemap',
+          '--typemap', '<(DEPTH)/url/mojo/gurl.typemap',
         ],
         'mojom_files': [
           'mojo/origin.mojom',
+          'mojo/url.mojom',
         ],
       },
       'includes': [ '../mojo/mojom_bindings_generator_explicit.gypi' ],
-      'dependencies': [
-        'url_interfaces_mojom',
-      ],
     },
     {
       'target_name': 'url_mojom',
@@ -139,8 +109,7 @@
       'includes': [ '../mojo/mojom_bindings_generator_explicit.gypi' ],
       'dependencies': [
         '../mojo/mojo_public.gyp:mojo_cpp_bindings',
-        'origin_mojom_chromium',
-        'url_mojom_chromium',
+        'url_interfaces_mojom',
       ],
     },
     {