Mojo bindings: Fix typemap includes.

url/url.gyp

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'includes': [
     'url_srcs.gypi',
@@ skipping 51 matching lines @@
         ['OS!="ios"', {
           'sources': [
             'mojo/url_gurl_struct_traits_unittest.cc',
           ],
         }],
       ],
       # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
       'msvs_disabled_warnings': [4267, ],
     },
     {
       '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_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' ],
     },
     {
-      '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',
-        ],
-        'mojom_files': [
-          'mojo/origin.mojom',
-        ],
-      },
-      'includes': [ '../mojo/mojom_bindings_generator_explicit.gypi' ],
-      'dependencies': [
-        'url_interfaces_mojom',
-      ],
-    },
-    {
       'target_name': 'url_mojom',
       'type': 'static_library',
       'export_dependent_settings': [
         '../mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
       'dependencies': [
         '../mojo/mojo_public.gyp:mojo_cpp_bindings',
         'url_interfaces_mojom',
       ],
     },
     {
       'target_name': 'url_test_interfaces_mojom',
       'type': 'none',
       'variables': {
         'mojom_extra_generator_args': [
           '--typemap', '<(DEPTH)/url/mojo/gurl.typemap',
           '--typemap', '<(DEPTH)/url/mojo/origin.typemap',
         ],
         'mojom_files': [
           'mojo/url_test.mojom',
         ],
       },
       'includes': [ '../mojo/mojom_bindings_generator_explicit.gypi' ],
       'dependencies': [
         '../mojo/mojo_public.gyp:mojo_cpp_bindings',
-        'origin_mojom_chromium',
-        'url_mojom_chromium',
+        'url_interfaces_mojom',
       ],
     },
     {
       'target_name': 'url_test_mojom',
       'type': 'static_library',
       'export_dependent_settings': [
         '../mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
       'dependencies': [
         '../mojo/mojo_public.gyp:mojo_cpp_bindings',
@@ skipping 70 matching lines @@
             '../build/isolate.gypi',
           ],
           'sources': [
             'url_unittests.isolate',
           ],
         },
       ],
     }],
   ],
 }