Even more test cleanup. Some fixes to non-test code.

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 32 matching lines @@
         'notifier/communicator/login_settings.h',
         'notifier/communicator/single_login_attempt.cc',
         'notifier/communicator/single_login_attempt.h',
         'notifier/communicator/xmpp_connection_generator.cc',
         'notifier/communicator/xmpp_connection_generator.h',
         'notifier/listener/listen_task.cc',
         'notifier/listener/listen_task.h',
         'notifier/listener/mediator_thread.h',
         'notifier/listener/mediator_thread_impl.cc',
         'notifier/listener/mediator_thread_impl.h',
-        'notifier/listener/mediator_thread_mock.h',
         'notifier/listener/notification_constants.cc',
         'notifier/listener/notification_constants.h',
         'notifier/listener/notification_defines.cc',
         'notifier/listener/notification_defines.h',
         'notifier/listener/push_notifications_listen_task.cc',
         'notifier/listener/push_notifications_listen_task.h',
         'notifier/listener/push_notifications_subscribe_task.cc',
         'notifier/listener/push_notifications_subscribe_task.h',
         'notifier/listener/push_notifications_thread.cc',
         'notifier/listener/push_notifications_thread.h',
@@ skipping 45 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',
         'notifier/base/chrome_async_socket_unittest.cc',
         'notifier/base/fake_ssl_client_socket_unittest.cc',
         'notifier/base/xmpp_connection_unittest.cc',
         'notifier/base/weak_xmpp_client_unittest.cc',
         'notifier/communicator/xmpp_connection_generator_unittest.cc',
+        'notifier/listener/mediator_thread_mock.cc',
+        'notifier/listener/mediator_thread_mock.h',
         'notifier/listener/push_notifications_subscribe_task_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': [
@@ skipping 21 matching lines @@
       ],
     },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: