DeviceUtils: Fix SU command for pre-M devices

build/android/devil/android/device_utils_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 the contents of device_utils.py (mostly DeviceUtils).
 """
 
 # pylint: disable=protected-access
@@ skipping 679 matching lines @@
     with self.assertCalls(
         self.call.adb.Uninstall('test.package', True)):
       self.device.Uninstall('test.package', True)
 
 
 class DeviceUtilsSuTest(DeviceUtilsTest):
   def testSu_preM(self):
     with self.patch_call(
         self.call.device.build_version_sdk,
         return_value=version_codes.LOLLIPOP_MR1):
-      self.assertEquals('su -c foo', self.device._Su('foo'))
+      self.assertEquals("su -c 'foo bar'", self.device._Su('foo bar'))
 
   def testSu_mAndAbove(self):
     with self.patch_call(
         self.call.device.build_version_sdk,
         return_value=version_codes.MARSHMALLOW):
-      self.assertEquals('su 0 foo', self.device._Su('foo'))
+      self.assertEquals('su 0 foo bar', self.device._Su('foo bar'))
 
 
 class DeviceUtilsRunShellCommandTest(DeviceUtilsTest):
 
   def setUp(self):
     super(DeviceUtilsRunShellCommandTest, self).setUp()
     self.device.NeedsSU = mock.Mock(return_value=False)
 
   def testRunShellCommand_commandAsList(self):
     with self.assertCall(self.call.adb.Shell('pm list packages'), ''):
@@ skipping 1376 matching lines @@
   def testGrantPermissions_BlackList(self):
     with self.patch_call(
         self.call.device.build_version_sdk, return_value=23):
         self.device.GrantPermissions(
             'package', ['android.permission.ACCESS_MOCK_LOCATION'])
 
 
 if __name__ == '__main__':
   logging.getLogger().setLevel(logging.DEBUG)
   unittest.main(verbosity=2)