Revert 55400 - Cleanup in base. This moves the implementation (and a bunch of...

base/base.gyp

 # Copyright (c) 2010 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'includes': [
     'base.gypi',
@@ skipping 37 matching lines @@
         'i18n/word_iterator.cc',
         'i18n/word_iterator.h',
       ],
     },
     {
       'target_name': 'base_unittests',
       'type': 'executable',
       'msvs_guid': '27A30967-4BBA-48D1-8522-CDE95F7B1CEC',
       'sources': [
         # Infrastructure files.
+        'multiprocess_test.h',
         'test/run_all_unittests.cc',
+        'test/test_suite.h',
 
         # Tests.
         'at_exit_unittest.cc',
         'atomicops_unittest.cc',
         'base64_unittest.cc',
         'bits_unittest.cc',
         'callback_unittest.cc',
         'cancellation_flag_unittest.cc',
         'command_line_unittest.cc',
         'condition_variable_unittest.cc',
@@ skipping 91 matching lines @@
         'worker_pool_unittest.cc',
       ],
       'include_dirs': [
         # word_iterator.h (used by word_iterator_unittest.cc) leaks an ICU
         # #include for unicode/uchar.h.  This should probably be cleaned up.
         '../third_party/icu/public/common',
       ],
       'dependencies': [
         'base',
         'base_i18n',
-        'test_support_base',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
       ],
       'conditions': [
         ['OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', {
           'sources!': [
             'file_version_info_unittest.cc',
             'worker_pool_linux_unittest.cc',
           ],
           'sources': [
@@ skipping 36 matching lines @@
             'wmi_util_unittest.cc',
           ],
         }],
       ],
     },
     {
       'target_name': 'test_support_base',
       'type': '<(library)',
       'dependencies': [
         'base',
-        '../testing/gmock.gyp:gmock',
-        '../testing/gtest.gyp:gtest',
       ],
       'sources': [
-        'test/multiprocess_test.cc',
-        'test/multiprocess_test.h',
-        'test/perf_test_suite.cc',
-        'test/perf_test_suite.h',
         'test/test_file_util.h',
         'test/test_file_util_linux.cc',
         'test/test_file_util_mac.cc',
         'test/test_file_util_posix.cc',
         'test/test_file_util_win.cc',
-        'test/test_suite.cc',
-        'test/test_suite.h',
       ],
     },
     {
       'target_name': 'test_support_perf',
       'type': '<(library)',
       'dependencies': [
         'base',
         '../testing/gtest.gyp:gtest',
       ],
       'sources': [
@@ skipping 36 matching lines @@
       ],
     }],
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: