Mojo: Change the blink variant from "wtf" to "blink".

mojo/mojom_bindings_generator.gypi

 # 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.
 
 {
   'includes': [
     'mojom_bindings_generator_variables.gypi',
   ],
   'variables': {
     'variables': {
-      'mojom_variant%': 'none',
-      'for_blink%': 'false',
+      'variables': {
+        'for_blink%': 'false',
+      },
+      'for_blink%': '<(for_blink)',
+      'conditions': [
+        ['for_blink=="true"', {
+          'mojom_output_languages%': 'c++',
+          'mojom_variant%': 'blink',
+          'mojom_generator_wtf_arg%': [
+            '--for_blink',
+          ],
+          'wtf_dependencies%': [
+            '<(DEPTH)/mojo/mojo_public.gyp:mojo_cpp_bindings_wtf_support',
+            '<(DEPTH)/third_party/WebKit/Source/wtf/wtf.gyp:wtf',
+          ],
+        }, {
+          'mojom_output_languages%': 'c++,javascript,java',
+          'mojom_variant%': 'none',
+          'mojom_generator_wtf_arg%': [],
+          'wtf_dependencies%': [],
+        }],
+      ],
     },
+    'for_blink%': '<(for_blink)',
     'mojom_variant%': '<(mojom_variant)',
+    'mojom_generator_wtf_arg%': '<(mojom_generator_wtf_arg)',
+    'wtf_dependencies%': '<(wtf_dependencies)',
+    'mojom_output_languages%': '<(mojom_output_languages)',
     'mojom_typemaps%': [],
-    'for_blink%': '<(for_blink)',
     'mojom_base_output_dir':
         '<!(python <(DEPTH)/build/inverse_depth.py <(DEPTH))',
     'mojom_generated_outputs': [
       '<!@(python <(DEPTH)/mojo/public/tools/bindings/mojom_list_outputs.py --basedir <(mojom_base_output_dir) --variant <(mojom_variant) <@(_sources))',
     ],
     'generated_typemap_file': '<(SHARED_INTERMEDIATE_DIR)/<(mojom_base_output_dir)/<(_target_name)_type_mappings',
-    'conditions': [
-      ['mojom_variant=="none"', {
-        'mojom_output_languages%': 'c++,javascript,java',
-      }, {
-        'mojom_output_languages%': 'c++',
-      }],
-      ['for_blink=="true"', {
-        'mojom_generator_wtf_arg%': [
-          '--for_blink',
-        ],
-        'wtf_dependencies%': [
-          '<(DEPTH)/mojo/mojo_public.gyp:mojo_cpp_bindings_wtf_support',
-          '<(DEPTH)/third_party/WebKit/Source/wtf/wtf.gyp:wtf',
-        ],
-      }, {
-        'mojom_generator_wtf_arg%': [],
-        'wtf_dependencies%': [],
-      }],
-    ],
   },
   'actions': [
     {
       'variables': {
         'java_out_dir': '<(PRODUCT_DIR)/java_mojo/<(_target_name)/src',
         'stamp_filename': '<(PRODUCT_DIR)/java_mojo/<(_target_name)/<(_target_name).stamp',
       },
       'action_name': '<(_target_name)_mojom_bindings_stamp',
       # The java output directory is deleted to ensure that the java library
       # doesn't try to compile stale files.
@@ skipping 101 matching lines @@
         '<(PRODUCT_DIR)/java_mojo/<(_target_name)/src',
       ],
       'additional_input_paths': [
         '<@(mojom_bindings_generator_sources)',
         '<@(_sources)',
       ],
     },
   },
   'hard_dependency': 1,
 }