| OLD | NEW | 
|   1 # Copyright 2014 The Chromium Authors. All rights reserved. |   1 # Copyright 2014 The Chromium Authors. All rights reserved. | 
|   2 # Use of this source code is governed by a BSD-style license that can be |   2 # Use of this source code is governed by a BSD-style license that can be | 
|   3 # found in the LICENSE file. |   3 # found in the LICENSE file. | 
|   4  |   4  | 
|   5 from pylib.gtest import gtest_test_instance |   5 from pylib.gtest import gtest_test_instance | 
|   6 from pylib.instrumentation import instrumentation_test_instance |   6 from pylib.instrumentation import instrumentation_test_instance | 
|   7 from pylib.perf import perf_test_instance |   7 from pylib.perf import perf_test_instance | 
|   8 from pylib.uirobot import uirobot_test_instance |  | 
|   9 from pylib.utils import isolator |   8 from pylib.utils import isolator | 
|  10  |   9  | 
|  11  |  10  | 
|  12 def CreateTestInstance(args, error_func): |  11 def CreateTestInstance(args, error_func): | 
|  13  |  12  | 
|  14   if args.command == 'gtest': |  13   if args.command == 'gtest': | 
|  15     return gtest_test_instance.GtestTestInstance( |  14     return gtest_test_instance.GtestTestInstance( | 
|  16         args, isolator.Isolator(), error_func) |  15         args, isolator.Isolator(), error_func) | 
|  17   elif args.command == 'instrumentation': |  16   elif args.command == 'instrumentation': | 
|  18     return instrumentation_test_instance.InstrumentationTestInstance( |  17     return instrumentation_test_instance.InstrumentationTestInstance( | 
|  19         args, isolator.Isolator(), error_func) |  18         args, isolator.Isolator(), error_func) | 
|  20   elif args.command == 'perf': |  19   elif args.command == 'perf': | 
|  21     return perf_test_instance.PerfTestInstance(args, error_func) |  20     return perf_test_instance.PerfTestInstance(args, error_func) | 
|  22   elif args.command == 'uirobot': |  | 
|  23     return uirobot_test_instance.UirobotTestInstance(args, error_func) |  | 
|  24  |  21  | 
|  25   error_func('Unable to create %s test instance.' % args.command) |  22   error_func('Unable to create %s test instance.' % args.command) | 
| OLD | NEW |