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

jingle/jingle.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,
   },  # variables
   'targets': [
     # A library for sending and receiving peer-issued notifications.
@@ skipping 77 matching lines @@
           ],
         }],
       ],
     },
     {
       'target_name': 'notifier_unit_tests',
       'type': 'executable',
       'sources': [
         # TODO(akalin): Write our own test suite and runner.
         '../base/test/run_all_unittests.cc',
+        '../base/test/test_suite.h',
         'notifier/base/chrome_async_socket_unittest.cc',
         'notifier/listener/talk_mediator_unittest.cc',
         'notifier/listener/send_update_task_unittest.cc',
         'notifier/listener/subscribe_task_unittest.cc',
         'notifier/listener/xml_element_util_unittest.cc',
       ],
       'include_dirs': [
         '..',
       ],
       'dependencies': [
         'notifier',
         '../base/base.gyp:base',
-        '../base/base.gyp:test_support_base',
         '../net/net.gyp:net',
         '../net/net.gyp:net_test_support',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/libjingle/libjingle.gyp:libjingle',
       ],
       # TODO(akalin): Remove this once we have our own test suite and
       # runner.
       'conditions': [
         ['OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', {
           'dependencies': [
             # Needed to handle the #include chain:
             #   base/test/test_suite.h
             #   gtk/gtk.h
             '../build/linux/system.gyp:gtk',
           ],
         }],
       ],
     },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: