[Android] Switch to DeviceUtils versions of GetPid, TakeScreenshot, and GetIoStats.

build/android/screenshot.py

 #!/usr/bin/env python
 
 # 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.
 
 """Takes a screenshot or a screen video capture from an Android device."""
 
 import logging
 import optparse
 import os
 import sys
 
 from pylib import android_commands
 from pylib import screenshot
 from pylib.device import device_utils
 
 def _PrintMessage(heading, eol='\n'):
   sys.stdout.write('%s%s' % (heading, eol))
   sys.stdout.flush()
 
 
 def _CaptureScreenshot(device, host_file):
-  host_file = device.old_interface.TakeScreenshot(host_file)
+  host_file = device.TakeScreenshot(host_file)
   _PrintMessage('Screenshot written to %s' % os.path.abspath(host_file))
 
 
 def _CaptureVideo(device, host_file, options):
   size = tuple(map(int, options.size.split('x'))) if options.size else None
   recorder = screenshot.VideoRecorder(device,
                                       megabits_per_second=options.bitrate,
                                       size=size,
                                       rotate=options.rotate)
   try:
     recorder.Start()
     _PrintMessage('Recording. Press Enter to stop...', eol='')
     raw_input()
   finally:
     recorder.Stop()
-  recorder.Pull(host_file)
+  host_file = recorder.Pull(host_file)
   _PrintMessage('Video written to %s' % os.path.abspath(host_file))
 
 
 def main():
   # Parse options.
   parser = optparse.OptionParser(description=__doc__,
                                  usage='screenshot.py [options] [filename]')
   parser.add_option('-d', '--device', metavar='ANDROID_DEVICE', help='Serial '
                     'number of Android device to use.', default=None)
   parser.add_option('-f', '--file', help='Save result to file instead of '
@@ skipping 29 matching lines @@
 
   if options.video:
     _CaptureVideo(device, host_file, options)
   else:
     _CaptureScreenshot(device, host_file)
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())