Move components/zip to third_party/zip

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 50 matching lines @@
         'chrome/test/data/json_schema_validator/',
         'chrome/test/data/pref_service/',
         'chrome/test/data/simple_open_search.xml',
         'chrome/test/data/top_sites/',
         'chrome/test/data/web_app_info/',
         'chrome/test/data/web_database',
         'chrome/test/data/webui/',
         'chrome/third_party/mock4js/',
         'net/data/ssl/certificates',
         'third_party/accessibility-developer-tools/gen/axs_testing.js',
+        'third_party/zlib/google/test/data',
     ]
     # The following are spell check data. Now only list the data under
     # third_party/hunspell_dictionaries which are used by unit tests.
     old_cwd = os.getcwd()
     os.chdir(constants.CHROME_DIR)
     test_files += glob.glob('third_party/hunspell_dictionaries/*.bdic')
     os.chdir(old_cwd)
     return test_files
-  elif test_suite_basename == 'components_unittests':
-    return [
-        'components/test/data/zip',
-    ]
   elif test_suite_basename == 'media_unittests':
     return [
         'media/test/data',
     ]
   elif test_suite_basename == 'net_unittests':
     return [
         'chrome/test/data/animate1.gif',
         'chrome/test/data/simple.html',
         'net/data/cache_tests',
         'net/data/filter_unittests',
@@ skipping 290 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()