enable two test cases in base_unittests with fix and disable one failure

build/android/pylib/single_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
 import sys
 
 from base_test_runner import BaseTestRunner
@@ skipping 124 matching lines @@
 
   def GetDataFilesForTestSuite(self):
     """Returns a list of data files/dirs needed by the test suite."""
     # 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 self.test_package.test_suite_basename in ['base_unittests',
                                                  'sql_unittests',
                                                  'unit_tests']:
       test_files = [
+          'base/data/file_util_unittest',
           'base/data/json/bom_feff.json',
-          'base/data/file_util_unittest',
           'net/data/cache_tests/insert_load1',
           'net/data/cache_tests/dirty_entry5',
           'net/data/ssl/certificates/',
           'ui/base/test/data/data_pack_unittest',
           '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',
@@ skipping 165 matching lines @@
   def TearDown(self):
     """Cleans up the test enviroment for the test suite."""
     self.tool.CleanUpEnvironment()
     if self.test_package.cleanup_test_files:
       self.adb.RemovePushedFiles()
     if self.dump_debug_info:
       self.dump_debug_info.StopRecordingLog()
     if self.test_package.performance_test:
       self.adb.TearDownPerformanceTest()
     super(SingleTestRunner, self).TearDown()