[Android] Log the size of data transerred to device.

build/android/pylib/gtest/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.
 
 import glob
 import logging
 import os
 
 from pylib import android_commands
 from pylib import constants
@@ skipping 175 matching lines @@
         'content/test/data/browser_plugin_focus_child.html',
         'content/test/data/rwhv_compositing_animation.html',
         'content/test/data/click-noreferrer-links.html',
         'content/test/data/browser_plugin_focus.html',
         'content/test/data/media',
         'third_party/webgl_conformance',
     ]
   return []
 
 
-def _GetOptionalDataFilesForTestSuite(test_suite_basename):
-  """Returns a list of data files/dirs that are pushed if present.
-
-  Args:
-    test_suite_basename: The test suite basename for which to return file paths.
-
-  Returns:
-    A list of test file and directory paths.
-  """
-  if test_suite_basename == 'content_browsertests':
-    # See http://crbug.com/105104 for why these are needed.
-    return [
-    ]
-  return []
-
-
 def _TestSuiteRequiresMockTestServer(test_suite_basename):
   """Returns True if the test suite requires mock test server."""
   tests_require_net_test_server = ['unit_tests', 'net_unittests',
                                    'content_unittests',
                                    'content_browsertests']
   return (test_suite_basename in
           tests_require_net_test_server)
 
 
 class TestRunner(base_test_runner.BaseTestRunner):
@@ skipping 46 matching lines @@
           device,
           test_suite,
           timeout,
           self._cleanup_test_files,
           self.tool,
           symbols_dir)
 
   #override
   def InstallTestPackage(self):
     self.test_package.StripAndCopyExecutable()
-    self.test_package.PushDataAndPakFiles()
 
   #override
   def PushDataDeps(self):
+    self.test_package.PushDataAndPakFiles()
     self.tool.CopyFiles()
     test_data = _GetDataFilesForTestSuite(self.test_package.test_suite_basename)
     if test_data:
       # Make sure SD card is ready.
       self.adb.WaitForSdCardReady(20)
-      for data in test_data:
-        self.CopyTestData([data], self.adb.GetExternalStorage())
-    optional_test_data = _GetOptionalDataFilesForTestSuite(
-        self.test_package.test_suite_basename)
-    if optional_test_data:
-      self.adb.WaitForSdCardReady(20)
-      for data in optional_test_data:
-        if os.path.exists(data):
-          self.CopyTestData([data], self.adb.GetExternalStorage())
+      self.CopyTestData(test_data, self.adb.GetExternalStorage())
     if self.test_package.test_suite_basename == 'webkit_unit_tests':
       self.PushWebKitUnitTestsData()
 
   def PushWebKitUnitTestsData(self):
     """Pushes the webkit_unit_tests data files to the device.
 
     The path of this directory is different when the suite is being run as
     part of a WebKit check-out.
     """
     webkit_src = os.path.join(constants.DIR_SOURCE_ROOT, 'third_party',
@@ skipping 61 matching lines @@
       self.LaunchChromeTestServerSpawner()
     self.tool.SetupEnvironment()
 
   #override
   def TearDown(self):
     """Cleans up the test enviroment for the test suite."""
     self.tool.CleanUpEnvironment()
     if self._cleanup_test_files:
       self.adb.RemovePushedFiles()
     super(TestRunner, self).TearDown()