Organize typemaps in Blink

third_party/WebKit/public/blink.gyp

Index: third_party/WebKit/public/blink.gyp
diff --git a/third_party/WebKit/public/blink.gyp b/third_party/WebKit/public/blink.gyp
index ad2aa6ae9a51fb3842f51bac64f177a210aeea9a..3930b93c50b8c20e188441e6574e0fbdf7eb8196 100644
--- a/third_party/WebKit/public/blink.gyp
+++ b/third_party/WebKit/public/blink.gyp
@@ -53,6 +53,10 @@
         'blink_android_mojo_sources': [
             'platform/modules/payments/payment_request.mojom',
         ],
+        'blink_typemap_sources': [
+            '<(DEPTH)/cc/ipc/surface_id.typemap',
+            '<(DEPTH)/cc/ipc/surface_sequence.typemap',
+        ],
     },
     'targets': [
         {
@@ -117,9 +121,7 @@
                     '<@(blink_android_mojo_sources)',
                 ],
                 'mojom_typemaps': [
-                    '<(DEPTH)/cc/ipc/surface_id.typemap',
-                    '<(DEPTH)/cc/ipc/surface_sequence.typemap',
-
+                    '<@(blink_typemap_sources)',
                 ],
                 'for_blink': 'true',
                 'use_new_wrapper_types': 'false',
@@ -127,7 +129,7 @@
             'dependencies' : [
                 '<(DEPTH)/cc/ipc/cc_ipc.gyp:interfaces_blink',
             ],
-            'includes': [
+           'includes': [

[jbroman, 2016/07/22 18:05:00]

nit: fix the indentation here please

                 '../../../mojo/mojom_bindings_generator_explicit.gypi',
             ],
         },
@@ -141,16 +143,15 @@
                     '<@(blink_android_mojo_sources)',
                 ],
                 'mojom_typemaps': [
-                  '../../../device/bluetooth/public/interfaces/bluetooth_uuid.typemap',
-                    '<(DEPTH)/cc/ipc/surface_id.typemap',
-                    '<(DEPTH)/cc/ipc/surface_sequence.typemap',
+                    '../../../device/bluetooth/public/interfaces/bluetooth_uuid.typemap',
+                    '<@(blink_typemap_sources)',
                 ],
                 'use_new_wrapper_types': 'false',
             },
             'dependencies' : [
                 '<(DEPTH)/cc/ipc/cc_ipc.gyp:interfaces',
             ],
-            'includes': [
+           'includes': [

[jbroman, 2016/07/22 18:05:00]

and here

                 '../../../mojo/mojom_bindings_generator_explicit.gypi',
             ],
         },