Mojo: Simplify typemap usage.

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 54 matching lines @@
           ],
         }],
       ],
       # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
       'msvs_disabled_warnings': [4267, ],
     },
     {
       'target_name': 'url_interfaces_mojom',
       'type': 'none',
       'variables': {
-        'mojom_extra_generator_args': [
-          '--typemap', '<(DEPTH)/url/mojo/origin.typemap',
-          '--typemap', '<(DEPTH)/url/mojo/gurl.typemap',
-        ],
         'mojom_files': [
           'mojo/origin.mojom',
           'mojo/url.mojom',
         ],
+        'mojom_typemaps': [
+          'mojo/gurl.typemap',
+          'mojo/origin.typemap',
+        ],
       },
       'includes': [ '../mojo/mojom_bindings_generator_explicit.gypi' ],
     },
     {
       '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',
+        'url_lib',
       ],
     },
     {
       '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',
         ],
+        'mojom_typemaps': [
+          'mojo/gurl.typemap',
+          'mojo/origin.typemap',
+        ],
       },
       'includes': [ '../mojo/mojom_bindings_generator_explicit.gypi' ],
       'dependencies': [
         '../mojo/mojo_public.gyp:mojo_cpp_bindings',
-        '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',
+        'url_lib',
         'url_mojom',
         'url_test_interfaces_mojom',
       ],
     },
   ],
   'conditions': [
     ['OS=="android"', {
       'targets': [
         {
           'target_name': 'url_jni_headers',
@@ skipping 60 matching lines @@
             '../build/isolate.gypi',
           ],
           'sources': [
             'url_unittests.isolate',
           ],
         },
       ],
     }],
   ],
 }