[Android] Move screenshot implementation back into AndroidCommands.

build/android/pylib/screenshot.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 os
 import tempfile
-import time
 
 from pylib import cmd_helper
 
 # TODO(jbudorick) Remove once telemetry gets switched over.
 import pylib.android_commands
 import pylib.device.device_utils
 
 
-def _GetTimestamp():
-  return time.strftime('%Y-%m-%d-%H%M%S', time.localtime())
-
-
-def _EnsureHostDirectory(host_file):
-  host_dir = os.path.dirname(os.path.abspath(host_file))
-  if not os.path.exists(host_dir):
-    os.makedirs(host_dir)
-
-
-def TakeScreenshot(device, host_file):
-  """Saves a screenshot image to |host_file| on the host.
-
-  Args:
-    device: DeviceUtils instance.
-    host_file: Path to the image file to store on the host.
-  """
-  host_file = os.path.abspath(host_file or
-                              'screenshot-%s.png' % _GetTimestamp())
-  _EnsureHostDirectory(host_file)
-  device_file = '%s/screenshot.png' % device.old_interface.GetExternalStorage()
-  device.old_interface.RunShellCommand(
-      '/system/bin/screencap -p %s' % device_file)
-  device.old_interface.PullFileFromDevice(device_file, host_file)
-  device.old_interface.RunShellCommand('rm -f "%s"' % device_file)
-  return host_file
-
-
 class VideoRecorder(object):
   """Records a screen capture video from an Android Device (KitKat or newer).
 
   Args:
     device: DeviceUtils instance.
     host_file: Path to the video file to store on the host.
     megabits_per_second: Video bitrate in megabits per second. Allowed range
                          from 0.1 to 100 mbps.
     size: Video frame size tuple (width, height) or None to use the device
           default.
     rotate: If True, the video will be rotated 90 degrees.
   """
   def __init__(self, device, host_file, megabits_per_second=4, size=None,
                rotate=False):
     # TODO(jbudorick) Remove once telemetry gets switched over.
     if isinstance(device, pylib.android_commands.AndroidCommands):
       device = pylib.device.device_utils.DeviceUtils(device)
     self._device = device
     self._device_file = (
         '%s/screen-recording.mp4' % device.old_interface.GetExternalStorage())
-    self._host_file = host_file or 'screen-recording-%s.mp4' % _GetTimestamp()
+    self._host_file = host_file or ('screen-recording-%s.mp4' %
+                                    device.old_interface.GetTimestamp())
     self._host_file = os.path.abspath(self._host_file)
     self._recorder = None
     self._recorder_pids = None
     self._recorder_stdout = None
     self._is_started = False
 
     self._args = ['adb']
     if self._device.old_interface.GetDevice():
       self._args += ['-s', self._device.old_interface.GetDevice()]
     self._args += ['shell', 'screenrecord', '--verbose']
     self._args += ['--bit-rate', str(megabits_per_second * 1000 * 1000)]
     if size:
       self._args += ['--size', '%dx%d' % size]
     if rotate:
       self._args += ['--rotate']
     self._args += [self._device_file]
 
   def Start(self):
     """Start recording video."""
-    _EnsureHostDirectory(self._host_file)
+    self._device.old_interface.EnsureHostDirectory(self._host_file)
     self._recorder_stdout = tempfile.mkstemp()[1]
     self._recorder = cmd_helper.Popen(
         self._args, stdout=open(self._recorder_stdout, 'w'))
     self._recorder_pids = self._device.old_interface.ExtractPid('screenrecord')
     if not self._recorder_pids:
       raise RuntimeError('Recording failed. Is your device running Android '
                          'KitKat or later?')
 
   def IsStarted(self):
     if not self._is_started:
@@ skipping 16 matching lines @@
   def Pull(self):
     """Pull resulting video file from the device.
 
     Returns:
       Output video file name on the host.
     """
     self._device.old_interface.PullFileFromDevice(
         self._device_file, self._host_file)
     self._device.old_interface.RunShellCommand('rm -f "%s"' % self._device_file)
     return self._host_file