[Android] Change object types from AndroidCommands to DeviceUtils in build/android/.

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
+
 
 class FlagChanger(object):
   """Changes the flags Chrome runs with.
 
   There are two different use cases for this file:
   * Flags are permanently set by calling Set().
   * Flags can be temporarily set for a particular set of unit tests.  These
     tests should call Restore() to revert the flags to their original state
     once the tests have completed.
   """
 
-  def __init__(self, adb, cmdline_file):
+  def __init__(self, device, cmdline_file):
     """Initializes the FlagChanger and records the original arguments.
 
     Args:
-      adb: An instance of AndroidCommands.
+      device: A DeviceUtils instance.
       cmdline_file: Path to the command line file on the device.
     """
-    self._adb = adb
+    # TODO(jbudorick) Remove once telemetry switches over.
+    if isinstance(device, pylib.android_commands.AndroidCommands):
+      device = pylib.device.device_utils.DeviceUtils(device)
+    self._device = device
     self._cmdline_file = cmdline_file
 
     # Save the original flags.
-    self._orig_line = self._adb.GetFileContents(self._cmdline_file)
+    self._orig_line = self._device.old_interface.GetFileContents(
+        self._cmdline_file)
     if self._orig_line:
       self._orig_line = self._orig_line[0].strip()
 
     # Parse out the flags into a list to facilitate adding and removing flags.
     self._current_flags = self._TokenizeFlags(self._orig_line)
 
   def Get(self):
     """Returns list of current flags."""
     return self._current_flags
 
@@ skipping 49 matching lines @@
   def _UpdateCommandLineFile(self):
     """Writes out the command line to the file, or removes it if empty."""
     logging.info('Current flags: %s', self._current_flags)
     # Root is not required to write to /data/local/tmp/.
     use_root = '/data/local/tmp/' not in self._cmdline_file
     if self._current_flags:
       # The first command line argument doesn't matter as we are not actually
       # launching the chrome executable using this command line.
       cmd_line = ' '.join(['_'] + self._current_flags)
       if use_root:
-        self._adb.SetProtectedFileContents(self._cmdline_file, cmd_line)
-        file_contents = self._adb.GetProtectedFileContents(self._cmdline_file)
+        self._device.old_interface.SetProtectedFileContents(
+            self._cmdline_file, cmd_line)
+        file_contents = self._device.old_interface.GetProtectedFileContents(
+            self._cmdline_file)
       else:
-        self._adb.SetFileContents(self._cmdline_file, cmd_line)
-        file_contents = self._adb.GetFileContents(self._cmdline_file)
+        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._adb.RunShellCommandWithSU('rm ' + self._cmdline_file)
+        self._device.old_interface.RunShellCommandWithSU(
+            'rm ' + self._cmdline_file)
       else:
-        self._adb.RunShellCommand('rm ' + self._cmdline_file)
-      assert not self._adb.FileExistsOnDevice(self._cmdline_file), (
+        self._device.old_interface.RunShellCommand('rm ' + self._cmdline_file)
+      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:
     * Flags are split using whitespace, unless the whitespace is within a
       pair of quotation marks.
     * Unlike the Java version, we keep the quotation marks around switch
@@ skipping 30 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:]