[Android] Switch to DeviceUtils versions of file functions.

tools/telemetry/telemetry/core/backends/chrome/android_browser_backend.py

 # Copyright 2013 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 os
 import re
 import subprocess
 import sys
 import time
 
 from telemetry.core import exceptions
 from telemetry.core import forwarders
 from telemetry.core import util
 from telemetry.core.backends import adb_commands
 from telemetry.core.backends import browser_backend
 from telemetry.core.backends.chrome import chrome_browser_backend
 from telemetry.core.forwarders import android_forwarder
 
+util.AddDirToPythonPath(util.GetChromiumSrcDir(), 'build', 'android')

[tonyg, 2014/06/27 22:59:28]

Why is this necessary? How did intent work without it?

+from pylib.device import device_errors
 from pylib.device import intent
 
 
 class AndroidBrowserBackendSettings(object):
 
   def __init__(self, adb, activity, cmdline_file, package, pseudo_exec_name,
                supports_tab_control):
     self.adb = adb
     self.activity = activity
     self.cmdline_file = cmdline_file
@@ skipping 39 matching lines @@
         cmdline_file=ChromeBackendSettings._GetCommandLineFile(adb),
         package=package,
         pseudo_exec_name='chrome',
         supports_tab_control=True)
 
   def GetDevtoolsRemotePort(self):
     return 'localabstract:chrome_devtools_remote'
 
   def PushProfile(self, new_profile_dir):
     # Pushing the profile is slow, so we don't want to do it every time.
-    # Avoid this by pushing to a safe location using PushIfNeeded, and
+    # Avoid this by pushing to a safe location using PushChangedFiles, and
     # then copying into the correct location on each test run.
 
     (profile_parent, profile_base) = os.path.split(new_profile_dir)
     # If the path ends with a '/' python split will return an empty string for
     # the base name; so we now need to get the base name from the directory.
     if not profile_base:
       profile_base = os.path.basename(profile_parent)
 
     saved_profile_location = '/sdcard/profile/%s' % profile_base
-    self.adb.device().old_interface.PushIfNeeded(
-        new_profile_dir, saved_profile_location)
+    self.adb.device().PushChangedFiles(new_profile_dir, saved_profile_location)
 
     self.adb.device().old_interface.EfficientDeviceDirectoryCopy(
         saved_profile_location, self.profile_dir)
     dumpsys = self.adb.device().RunShellCommand(
         'dumpsys package %s' % self.package)
     id_line = next(line for line in dumpsys if 'userId=' in line)
     uid = re.search('\d+', id_line).group()
     files = self.adb.device().RunShellCommand(
         'ls "%s"' % self.profile_dir, as_root=True)
     files.remove('lib')
@@ skipping 137 matching lines @@
     def IsProtectedFile(name):
       if self._adb.device().old_interface.FileExistsOnDevice(name):
         return not self._adb.device().old_interface.IsFileWritableOnDevice(name)
       else:
         parent_name = os.path.dirname(name)
         if parent_name != '':
           return IsProtectedFile(parent_name)
         else:
           return True
 
-    if IsProtectedFile(self._backend_settings.cmdline_file):
-      if not self._adb.device().old_interface.CanAccessProtectedFileContents():
-        logging.critical('Cannot set Chrome command line. '
-                         'Fix this by flashing to a userdebug build.')
-        sys.exit(1)
+    protected = IsProtectedFile(self._backend_settings.cmdline_file)
+    try:
       self._saved_cmdline = ''.join(
-          self._adb.device().old_interface.GetProtectedFileContents(
-              self._backend_settings.cmdline_file)
+          self._adb.device().ReadFile(
+              self._backend_settings.cmdline_file, as_root=protected)
           or [])
-      self._adb.device().old_interface.SetProtectedFileContents(
-          self._backend_settings.cmdline_file, file_contents)
-    else:
-      self._saved_cmdline = ''.join(
-          self._adb.device().old_interface.GetFileContents(
-              self._backend_settings.cmdline_file)
-          or [])
-      self._adb.device().old_interface.SetFileContents(
-          self._backend_settings.cmdline_file, file_contents)
+      self._adb.device().WriteFile(
+          self._backend_settings.cmdline_file, file_contents,
+          as_root=protected)
+    except device_errors.CommandFailedError:
+      logging.critical('Cannot set Chrome command line. '
+                       'Fix this by flashing to a userdebug build.')
+      sys.exit(1)
 
   def Start(self):
     self._SetUpCommandLine()
     self._adb.device().RunShellCommand('logcat -c')
     if self.browser_options.startup_url:
       url = self.browser_options.startup_url
     elif self.browser_options.profile_dir:
       url = None
     else:
       # If we have no existing tabs start with a blank page since default
@@ skipping 136 matching lines @@
                       subprocess.Popen([tombstones, '-w', '--device',
                                         self._adb.device_serial()],
                                        stdout=subprocess.PIPE).communicate()[0])
     return ret
 
   def AddReplayServerOptions(self, extra_wpr_args):
     if not self.forwarder_factory.does_forwarder_override_dns:
       extra_wpr_args.append('--no-dns_forwarding')
     if self.browser_options.netsim:
       extra_wpr_args.append('--net=%s' % self.browser_options.netsim)