Update from https://crrev.com/304121

build/android/pylib/instrumentation/test_runner_test.py

 #!/usr/bin/env python
 # 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.
 
 
 """Unit tests for instrumentation.TestRunner."""
 
 # pylint: disable=W0212
 
@@ skipping 126 matching lines @@
     self.assertEqual(0, code)
     self.assertEqual(['hello', 'world', '', ''], result)
     self.assertEqual([(1, {'class': ['foo'], 'test': ['bar']})], statuses)
 
   def testGenerateTestResult_noStatus(self):
     result = self.instance._GenerateTestResult(
         'test.package.TestClass#testMethod', [], 0, 1000)
     self.assertEqual('test.package.TestClass#testMethod', result.GetName())
     self.assertEqual(base_test_result.ResultType.UNKNOWN, result.GetType())
     self.assertEqual('', result.GetLog())
-    self.assertEqual(1000, result.GetDur())
+    self.assertEqual(1000, result.GetDuration())
 
   def testGenerateTestResult_testPassed(self):
     statuses = [
       (1, {
         'class': ['test.package.TestClass'],
         'test': ['testMethod'],
       }),
       (0, {
         'class': ['test.package.TestClass'],
         'test': ['testMethod'],
@@ skipping 88 matching lines @@
         'stack': ['', 'foo/bar.py (27)', 'hello/world.py (42)'],
       }),
     ]
     result = self.instance._GenerateTestResult(
         'test.package.TestClass#testMethod', statuses, 0, 1000)
     self.assertEqual(base_test_result.ResultType.CRASH, result.GetType())
     self.assertEqual('\nfoo/bar.py (27)\nhello/world.py (42)', result.GetLog())
 
   def test_RunTest_verifyAdbShellCommand(self):
     self.instance.options.test_runner = 'MyTestRunner'
-    self.instance.device.RunShellCommand = mock.Mock()
+    self.instance.device.StartInstrumentation = mock.Mock()
     self.instance.test_pkg.GetPackageName = mock.Mock(
         return_value='test.package')
     self.instance._GetInstrumentationArgs = mock.Mock(
         return_value={'test_arg_key': 'test_arg_value'})
     self.instance._RunTest('test.package.TestClass#testMethod', 100)
-    self.instance.device.RunShellCommand.assert_called_with(
-        ['am', 'instrument', '-r',
-         '-e', 'test_arg_key', 'test_arg_value',
-         '-e', 'class', 'test.package.TestClass#testMethod',
-         '-w', 'test.package/MyTestRunner'],
+    self.instance.device.StartInstrumentation.assert_called_with(
+        'test.package/MyTestRunner', raw=True,
+        extras={
+            'test_arg_key': 'test_arg_value',
+            'class': 'test.package.TestClass#testMethod'
+        },
         timeout=100, retries=0)
 
 if __name__ == '__main__':
   unittest.main(verbosity=2)