Remove the unused push_deps option from the test runners.

build/android/pylib/base/base_test_runner.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.
 
 """Base class for running tests on a single device."""
 
 import logging
 import time
 
 from pylib import ports
 from pylib.chrome_test_server_spawner import SpawningServer
 from pylib.device import device_utils
 from pylib.forwarder import Forwarder
 from pylib.valgrind_tools import CreateTool
 # TODO(frankf): Move this to pylib/utils
 import lighttpd_server
 
 
 # A file on device to store ports of net test server. The format of the file is
 # test-spawner-server-port:test-server-port
 NET_TEST_SERVER_PORT_INFO_FILE = 'net-test-server-ports'
 
 
 class BaseTestRunner(object):
   """Base class for running tests on a single device."""
 
-  def __init__(self, device_serial, tool, push_deps=True,
-               cleanup_test_files=False):
+  def __init__(self, device_serial, tool, cleanup_test_files=False):
     """
       Args:
         device: Tests will run on the device of this ID.
         tool: Name of the Valgrind tool.
-        push_deps: If True, push all dependencies to the device.
         cleanup_test_files: Whether or not to cleanup test files on device.
     """
     self.device_serial = device_serial
     self.device = device_utils.DeviceUtils(device_serial)
     self.tool = CreateTool(tool, self.device)
     self._http_server = None
     self._forwarder_device_port = 8000
     self.forwarder_base_url = ('http://localhost:%d' %
         self._forwarder_device_port)
     self._spawning_server = None
     # We will allocate port for test server spawner when calling method
     # LaunchChromeTestServerSpawner and allocate port for test server when
     # starting it in TestServerThread.
     self.test_server_spawner_port = 0
     self.test_server_port = 0
-    self._push_deps = push_deps
     self._cleanup_test_files = cleanup_test_files
 
   def _PushTestServerPortInfoToDevice(self):
     """Pushes the latest port information to device."""
     self.device.WriteFile(
         self.device.GetExternalStoragePath() + '/' +
             NET_TEST_SERVER_PORT_INFO_FILE,
         '%d:%d' % (self.test_server_spawner_port, self.test_server_port))
 
   def RunTest(self, test):
@@ skipping 12 matching lines @@
     """Installs the test package once before all tests are run."""
     pass
 
   def PushDataDeps(self):
     """Push all data deps to device once before all tests are run."""
     pass
 
   def SetUp(self):
     """Run once before all tests are run."""
     self.InstallTestPackage()
-    push_size_before = self.device.old_interface.GetPushSizeInfo()
-    if self._push_deps:
-      logging.warning('Pushing data files to device.')
-      self.PushDataDeps()
-      push_size_after = self.device.old_interface.GetPushSizeInfo()
-      logging.warning(
-          'Total data: %0.3fMB' %
-          ((push_size_after[0] - push_size_before[0]) / float(2 ** 20)))
-      logging.warning(
-          'Total data transferred: %0.3fMB' %
-          ((push_size_after[1] - push_size_before[1]) / float(2 ** 20)))
-    else:
-      logging.warning('Skipping pushing data to device.')

[mikecase (-- gone --), 2014/11/01 00:53:54]

PushDataDeps is always an empty function except for Instrumentation tests. I
will be moving PushDataDeps to instrumentation/setup.py in a future CL. 

Also, these log statements I'm removing should have probably been inside
PushDataDeps because they appear to be meaningless for anything but
Instrumentation tests. Look at the logs here for example ...
http://build.chromium.org/p/chromium.linux/builders/Android%20Tests%20%28dbg%...

W   11.157s b2bb  Total data: 0.000MB
W   11.157s b2bb  Total data transferred: 0.000MB
W   11.183s 04ae  Pushing data files to device.
W   11.183s 04ae  Total data: 0.000MB
W   11.183s 04ae  Total data transferred: 0.000MB
W   11.416s a2b6  Pushing data files to device.

[jbudorick, 2014/11/03 15:18:47]

In theory, it'd be nice to do this at the same time that we push data deps for
gtests. In practice, this is pretty low priority because of the refactor.
+1

+    self.PushDataDeps()
 
   def TearDown(self):
     """Run once after all tests are run."""
     self.ShutdownHelperToolsForTestSuite()
     if self._cleanup_test_files:
       self.device.old_interface.RemovePushedFiles()
 
   def LaunchTestHttpServer(self, document_root, port=None,
                            extra_config_contents=None):
     """Launches an HTTP server to serve HTTP tests.
@@ skipping 87 matching lines @@
         break
       else:
         error_msgs.append(error_msg)
       self._spawning_server.Stop()
       # Wait for 2 seconds then restart.
       time.sleep(2)
     if not server_ready:
       logging.error(';'.join(error_msgs))
       raise Exception('Can not start the test spawner server.')
     self._PushTestServerPortInfoToDevice()