Alphabetize defines in generated SkUserConfig.

platform_tools/android/tests/generate_user_config_tests.py

 #!/usr/bin/python
 
 # Copyright 2014 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """
 Test generate_user_config.py.
 """
@@ skipping 23 matching lines @@
 def generate_dummy_user_config(original_sk_user_config,
                                require_sk_user_config, target_dir):
   # Add an arbitrary set of defines
   defines = [ 'SK_BUILD_FOR_ANDROID',
               'SK_BUILD_FOR_ANDROID_FRAMEWORK',
               'SK_SCALAR_IS_FLOAT',
               'foo',
               'bar' ]
   gen_config(original_sk_user_config=original_sk_user_config,
              require_sk_user_config=require_sk_user_config,
-             target_dir=target_dir, ordered_set=defines)
+             target_dir=target_dir, defines=defines)
 
 
 class GenUserConfigTest(unittest.TestCase):
 
   def test_missing_sk_user_config(self):
     tmp = tempfile.mkdtemp()
     original = os.path.join(tmp, MISSING_FILENAME)
     assert not os.path.exists(original)
 
 
     # With require_sk_user_config set to True, an AssertionError will be
     # thrown when original_sk_user_config is missing.
     with self.assertRaises(AssertionError):
-      ordered_set = [ 'define' ]
+      defines = [ 'define' ]
       gen_config(original_sk_user_config=original,
                  require_sk_user_config=True,
-                 target_dir=tmp, ordered_set=ordered_set)
+                 target_dir=tmp, defines=defines)
 
     # With require_sk_user_config set to False, it is okay for
     # original_sk_user_config to be missing.
     generate_dummy_user_config(original_sk_user_config=original,
                                require_sk_user_config=False, target_dir=tmp)
     actual_name = os.path.join(tmp, MISSING_FILENAME)
     utils.compare_to_expectation(actual_name=actual_name,
                                  expectation_name=MISSING_FILENAME,
                                  assert_true=self.assertTrue,
                                  msg=REBASELINE_MSG)
@@ skipping 27 matching lines @@
   parser = argparse.ArgumentParser()
   parser.add_argument('-r', '--rebaseline', help='Rebaseline expectations.',
                       action='store_true')
   args = parser.parse_args()
 
   if args.rebaseline:
     rebaseline()
   else:
     main()