Fix runtest script so it respects test-platform arg.

scripts/slave/runtest.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """A tool used to run a Chrome test executable and process the output.
 
 This script is used by the buildbot slaves. It must be run from the outer
 build directory, e.g. chrome-release/build/.
 
@@ skipping 1848 matching lines @@
     elif sys.platform.startswith('darwin'):
       test_platform = options.factory_properties.get(
           'test_platform', options.test_platform)
       if test_platform in ('ios-simulator',):
         result = _MainIOS(options, args, extra_env)
       else:
         result = _MainMac(options, args, extra_env)
     elif sys.platform == 'win32':
       result = _MainWin(options, args, extra_env)
     elif sys.platform == 'linux2':
-      if options.factory_properties.get('test_platform', '') == 'android':
+      if options.factory_properties.get('test_platform',
+            options.test_platform) == 'android':
         result = _MainAndroid(options, args, extra_env)
       else:
         result = _MainLinux(options, args, extra_env)
     else:
       sys.stderr.write('Unknown sys.platform value %s\n' % repr(sys.platform))
       return 1
 
     _UploadProfilingData(options, args)
 
     new_temp_files = _GetTempCount()
@@ skipping 12 matching lines @@
   finally:
     if did_launch_dbus:
       # It looks like the command line argument --exit-with-session
       # isn't working to clean up the spawned dbus-daemon. Kill it
       # manually.
       _ShutdownDBus()
 
 
 if '__main__' == __name__:
   sys.exit(main())