Update from https://crrev.com/317530

mojo/tools/mopy/gn_unittest.py

 # Copyright 2014 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.
 
 import itertools
 import sys
 import unittest
 
 import mopy.gn as gn
 
 from mopy.config import Config
 
 
 class GTestListTestsTest(unittest.TestCase):
   """Tests mopy.gn."""
 
   def testConfigToGNToConfig(self):
     """Tests that config to gn to config is the identity"""
     configs_to_test = {
       "target_os": [None, "android", "chromeos", "linux"],
-      "target_arch": [None, "x86", "x64", "arm"],
+      "target_cpu": [None, "x86", "x64", "arm"],
       "is_debug": [False, True],
       "is_clang": [False, True],
       "sanitizer": [None, Config.SANITIZER_ASAN],
       "use_goma": [False],
       "use_nacl": [False, True],
       "dcheck_always_on": [False, True],
     }
 
     for args in _iterate_over_config(configs_to_test):
       config = Config(**args)
       gn_args = gn.GNArgsForConfig(config)
       new_config = gn.ConfigForGNArgs(gn_args)
       self.assertDictEqual(config.values, new_config.values)
 
   def testGNToConfigToGN(self):
     """Tests that gn to config to gn is the identity"""
     configs_to_test = {
       "os": [None, "android", "chromeos"],
-      "target_arch": ["x86", "x64", "arm"],
+      "target_cpu": ["x86", "x64", "arm"],
       "is_debug": [False, True],
       "is_clang": [False, True],
       "is_asan": [False, True],
       "use_goma": [False],
       "mojo_use_nacl": [False, True],
       "dcheck_always_on": [False, True],
     }
 
     for args in _iterate_over_config(configs_to_test):
       if args.get('os', None) == "chromeos":
@@ skipping 10 matching lines @@
 
 
 def _iterate_over_config(config):
   def product_to_dict(p):
     return dict(filter(lambda x: x[1] is not None, zip(config.keys(), p)))
   return itertools.imap(product_to_dict, itertools.product(*config.values()))
 
 
 if __name__ == "__main__":
   unittest.main()