base: Move the rest of JSONValueSerializer unit tests from c/common to base/json.

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 17 matching lines @@
     A list of test file and directory paths.
   """
   # Ideally, we'd just push all test data. However, it has >100MB, and a lot
   # of the files are not relevant (some are used for browser_tests, others for
   # features not supported, etc..).
   if test_suite_basename in ['base_unittests', 'sql_unittests', 'unit_tests']:
     test_files = [
         'base/data/file_util_unittest',
         'base/data/json/bom_feff.json',
         'base/prefs/test/data/pref_service',
+        'base/test/data/serializer_nested_test.json',
+        'base/test/data/serializer_test.json',
+        'base/test/data/serializer_test_nowhitespace.json',
         'chrome/test/data/download-test1.lib',
         'chrome/test/data/extensions/bad_magic.crx',
         'chrome/test/data/extensions/good.crx',
         'chrome/test/data/extensions/icon1.png',
         'chrome/test/data/extensions/icon2.png',
         'chrome/test/data/extensions/icon3.png',
         'chrome/test/data/extensions/allow_silent_upgrade/',
         'chrome/test/data/extensions/app/',
         'chrome/test/data/extensions/bad/',
         'chrome/test/data/extensions/effective_host_permissions/',
         'chrome/test/data/extensions/empty_manifest/',
         'chrome/test/data/extensions/good/Extensions/',
         'chrome/test/data/extensions/manifest_tests/',
         'chrome/test/data/extensions/page_action/',
         'chrome/test/data/extensions/permissions/',
         'chrome/test/data/extensions/script_and_capture/',
         'chrome/test/data/extensions/unpacker/',
         'chrome/test/data/bookmarks/',
         'chrome/test/data/components/',
         'chrome/test/data/extensions/json_schema_test.js',
         'chrome/test/data/History/',
         'chrome/test/data/json_schema_validator/',
         'chrome/test/data/pref_service/',
-        'chrome/test/data/serializer_nested_test.js',
-        'chrome/test/data/serializer_test.js',
-        'chrome/test/data/serializer_test_nowhitespace.js',
         'chrome/test/data/top_sites/',
         'chrome/test/data/web_app_info/',
         'chrome/test/data/web_database',
         'chrome/test/data/webui/',
         'chrome/test/data/zip',
         'chrome/third_party/mock4js/',
         'content/browser/gpu/software_rendering_list.json',
         'net/data/cache_tests/insert_load1',
         'net/data/cache_tests/dirty_entry5',
         'net/data/ssl/certificates/',
@@ skipping 40 matching lines @@
         'third_party/hyphen/hyph_en_US.dic',
         ]
   elif test_suite_basename == 'media_unittests':
     return [
         'media/test/data',
         ]
   elif test_suite_basename == 'cc_perftests':
     return [
       'cc/test/data',
     ]
+  elif test_suite_basename == 'perf_tests':
+    return [
+      'base/test/data',
+    ]
   elif test_suite_basename == 'content_browsertests':
     return [
       'content/test/data',
     ]
   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',
@@ skipping 142 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()