[Android] Switch to DeviceUtils version of RunShellCommand.

build/android/pylib/flag_changer.py

 # 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.
 
 import logging
 
 import pylib.android_commands
 import pylib.device.device_utils
 
 
@@ skipping 96 matching lines @@
             self._cmdline_file, cmd_line)
         file_contents = self._device.old_interface.GetProtectedFileContents(
             self._cmdline_file)
       else:
         self._device.old_interface.SetFileContents(self._cmdline_file, cmd_line)
         file_contents = self._device.old_interface.GetFileContents(
             self._cmdline_file)
       assert len(file_contents) == 1 and file_contents[0] == cmd_line, (
           'Failed to set the command line file at %s' % self._cmdline_file)
     else:
-      if use_root:
-        self._device.old_interface.RunShellCommandWithSU(
-            'rm ' + self._cmdline_file)
-      else:
-        self._device.old_interface.RunShellCommand('rm ' + self._cmdline_file)
+      self._device.RunShellCommand('rm ' + self._cmdline_file, root=use_root)
       assert (
           not self._device.old_interface.FileExistsOnDevice(
               self._cmdline_file)), (
           'Failed to remove the command line file at %s' % self._cmdline_file)
 
   @staticmethod
   def _TokenizeFlags(line):
     """Changes the string containing the command line into a list of flags.
 
     Follows similar logic to CommandLine.java::tokenizeQuotedArguments:
@@ skipping 33 matching lines @@
 
     # Tack on the last flag.
     if not current_flag:
       if within_quotations:
         logging.warn('Unterminated quoted argument: ' + line)
     else:
       tokenized_flags.append(current_flag)
 
     # Return everything but the program name.
     return tokenized_flags[1:]