Revert of 👔 Reland of Move side-loaded test data /sdcard -> /sdcard/gtestdata

build/android/pylib/remote/device/remote_device_test_run.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.
 
 """Run specific test on specific environment."""
 
 import json
 import logging
 import os
 import re
@@ skipping 212 matching lines @@
 
   def _AmInstrumentTestSetup(self, app_path, test_path, runner_package,
                              environment_variables, extra_apks=None):
     config = {'runner': runner_package}
     if environment_variables:
       config['environment_vars'] = ','.join(
           '%s=%s' % (k, v) for k, v in environment_variables.iteritems())
 
     self._app_id = self._UploadAppToDevice(app_path)
 
-    # TODO(agrieve): If AMP is ever ressurected, this needs to be changed to put
-    #     test files under /sdcard/gtestdata.  http://crbug.com/607169
     data_deps = self._test_instance.GetDataDependencies()
     if data_deps:
       with tempfile.NamedTemporaryFile(suffix='.zip') as test_with_deps:
         sdcard_files = []
         additional_apks = []
         host_test = os.path.basename(test_path)
         with zipfile.ZipFile(test_with_deps.name, 'w') as zip_file:
           zip_file.write(test_path, host_test, zipfile.ZIP_DEFLATED)
           for h, _ in data_deps:
             if os.path.isdir(h):
@@ skipping 138 matching lines @@
         self._LogLogcat()
         self._LogAdbTraceLog()
         raise remote_device_helper.RemoteDeviceError(
             'Remote service unable to reach device.', is_infra_error=True)
       else:
         # Remote service is reporting a failure, but no failure in results obj.
         if results.DidRunPass():
           results.AddResult(base_test_result.BaseTestResult(
               'Remote service detected error.',
               base_test_result.ResultType.UNKNOWN))