Update from https://crrev.com/312398

build/android/pylib/remote/device/remote_device_environment.py

 # Copyright 2014 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.
 
 """Environment setup and teardown for remote devices."""
 
 import logging
 import os
 import random
 import sys
 
 from pylib import constants
 from pylib.base import environment
 from pylib.remote.device import appurify_sanitized
 from pylib.remote.device import remote_device_helper
 
 class RemoteDeviceEnvironment(environment.Environment):
   """An environment for running on remote devices."""
 
+  _ENV_KEY = 'env'
+  _DEVICE_KEY = 'device'
+
   def __init__(self, args, error_func):
     """Constructor.
 
     Args:
       args: Command line arguments.
       error_func: error to show when using bad command line arguments.
     """
     super(RemoteDeviceEnvironment, self).__init__()
 
     if args.api_key_file:
@@ skipping 65 matching lines @@
       self.SetUp()
       return self
     except:
       self.__exit__(*sys.exc_info())
       raise
 
   def __exit__(self, exc_type, exc_val, exc_tb):
     """Tears down the test run when used as a context manager."""
     self.TearDown()
 
+  def DumpTo(self, persisted_data):
+    env_data = {
+      self._DEVICE_KEY: self._device,
+    }
+    persisted_data[self._ENV_KEY] = env_data
+
+  def LoadFrom(self, persisted_data):
+    env_data = persisted_data[self._ENV_KEY]
+    self._device = env_data[self._DEVICE_KEY]
+
   def _GetAccessToken(self):
     """Generates access token for remote device service."""
     logging.info('Generating remote service access token')
     with appurify_sanitized.SanitizeLogging(self._verbose_count,
                                             logging.WARNING):
       access_token_results = appurify_sanitized.api.access_token_generate(
           self._api_key, self._api_secret)
     remote_device_helper.TestHttpResponse(access_token_results,
                                           'Unable to generate access token.')
     self._access_token = access_token_results.json()['response']['access_token']
@@ skipping 23 matching lines @@
         continue
       if self._remote_device and device['name'] != self._remote_device:
         continue
       if (self._remote_device_os
           and device['os_version'] != self._remote_device_os):
         continue
       if ((self._remote_device and self._remote_device_os)
           or device['available_devices_count']):
         logging.info('Found device: %s %s',
                      device['name'], device['os_version'])
-        return device['device_type_id']
+        return device
     self._NoDeviceFound(device_list)
 
   def _PrintAvailableDevices(self, device_list):
     def compare_devices(a,b):
       for key in ('os_version', 'name'):
         c = cmp(a[key], b[key])
         if c:
           return c
       return 0
 
     logging.critical('Available Android Devices:')
     android_devices = (d for d in device_list if d['os_name'] == 'Android')
     for d in sorted(android_devices, compare_devices):
       logging.critical('  %s %s', d['os_version'].ljust(7), d['name'])
 
   def _NoDeviceFound(self, device_list):
     self._PrintAvailableDevices(device_list)
     raise remote_device_helper.RemoteDeviceError('No device found.')
 
   @property
-  def device(self):
-    return self._device
+  def collect(self):
+    return self._collect
+
+  @property
+  def device_type_id(self):
+    return self._device['device_type_id']
+
+  @property
+  def only_output_failures(self):
+    # TODO(jbudorick): Remove this once b/18981674 is fixed.
+    return True
+
+  @property
+  def results_path(self):
+    return self._results_path
+
+  @property
+  def runner_package(self):
+    return self._runner_package
+
+  @property
+  def runner_type(self):
+    return self._runner_type
+
+  @property
+  def timeouts(self):
+    return self._timeouts
 
   @property
   def token(self):
     return self._access_token
 
   @property
-  def results_path(self):
-    return self._results_path
-
-  @property
-  def runner_type(self):
-    return self._runner_type
-
-  @property
-  def runner_package(self):
-    return self._runner_package
-
-  @property
   def trigger(self):
     return self._trigger
 
   @property
-  def collect(self):
-    return self._collect
-
-  @property
   def verbose_count(self):
     return self._verbose_count
-
-  @property
-  def timeouts(self):
-    return self._timeouts