Revert 138216 - [Sync] Turn notifier::PushClient into an interface

jingle/jingle.gyp

 # 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },  # variables
   'targets': [
     # A library of various utils for integration with libjingle.
@@ skipping 57 matching lines @@
         'notifier/base/xmpp_connection.cc',
         'notifier/base/xmpp_connection.h',
         'notifier/communicator/connection_settings.cc',
         'notifier/communicator/connection_settings.h',
         'notifier/communicator/login.cc',
         'notifier/communicator/login.h',
         'notifier/communicator/login_settings.cc',
         'notifier/communicator/login_settings.h',
         'notifier/communicator/single_login_attempt.cc',
         'notifier/communicator/single_login_attempt.h',
-        'notifier/listener/non_blocking_push_client.cc',
-        'notifier/listener/non_blocking_push_client.h',
+        'notifier/listener/push_client.cc',
+        'notifier/listener/push_client.h',
         'notifier/listener/notification_constants.cc',
         'notifier/listener/notification_constants.h',
         'notifier/listener/notification_defines.cc',
         'notifier/listener/notification_defines.h',
-        'notifier/listener/push_client_observer.cc',
-        'notifier/listener/push_client_observer.h',
-        'notifier/listener/push_client.cc',
-        'notifier/listener/push_client.h',
         'notifier/listener/push_notifications_listen_task.cc',
         'notifier/listener/push_notifications_listen_task.h',
         'notifier/listener/push_notifications_send_update_task.cc',
         'notifier/listener/push_notifications_send_update_task.h',
         'notifier/listener/push_notifications_subscribe_task.cc',
         'notifier/listener/push_notifications_subscribe_task.h',
         'notifier/listener/xml_element_util.cc',
         'notifier/listener/xml_element_util.h',
-        'notifier/listener/xmpp_push_client.cc',
-        'notifier/listener/xmpp_push_client.h',
       ],
       'defines' : [
         '_CRT_SECURE_NO_WARNINGS',
         '_USE_32BIT_TIME_T',
       ],
       'dependencies': [
         '../base/base.gyp:base',
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../net/net.gyp:net',
         '../third_party/expat/expat.gyp:expat',
@@ skipping 11 matching lines @@
       ],
     },
     {
       'target_name': 'notifier_test_util',
       'type': 'static_library',
       'sources': [
         'notifier/base/fake_base_task.cc',
         'notifier/base/fake_base_task.h',
         'notifier/base/mock_task.cc',
         'notifier/base/mock_task.h',
-        'notifier/listener/fake_push_client.cc',
-        'notifier/listener/fake_push_client.h',
-        'notifier/listener/fake_push_client_observer.cc',
-        'notifier/listener/fake_push_client_observer.h',
       ],
       'dependencies': [
         'notifier',
         '../base/base.gyp:base',
         '../testing/gmock.gyp:gmock',
       ],
     },
     {
       'target_name': 'jingle_glue_test_util',
       'type': 'static_library',
@@ skipping 20 matching lines @@
         'glue/thread_wrapper_unittest.cc',
         'notifier/base/chrome_async_socket_unittest.cc',
         'notifier/base/fake_ssl_client_socket_unittest.cc',
         'notifier/base/proxy_resolving_client_socket_unittest.cc',
         'notifier/base/task_pump_unittest.cc',
         'notifier/base/xmpp_connection_unittest.cc',
         'notifier/base/weak_xmpp_client_unittest.cc',
         'notifier/communicator/connection_settings_unittest.cc',
         'notifier/communicator/login_settings_unittest.cc',
         'notifier/communicator/single_login_attempt_unittest.cc',
-        'notifier/listener/non_blocking_push_client_unittest.cc',
         'notifier/listener/push_client_unittest.cc',
         'notifier/listener/push_notifications_send_update_task_unittest.cc',
         'notifier/listener/push_notifications_subscribe_task_unittest.cc',
         'notifier/listener/xml_element_util_unittest.cc',
-        'notifier/listener/xmpp_push_client_unittest.cc',
         'run_all_unittests.cc',
       ],
       'conditions': [
         ['OS=="android"', {
           'sources!': [
             # TODO(jrg):
             # EXPECT_DEBUG_DEATH() uses features not enabled.
             # Should we -std=c++0x or -std=gnu++0x?
             'notifier/base/chrome_async_socket_unittest.cc',
             'notifier/base/xmpp_connection_unittest.cc',
@@ skipping 11 matching lines @@
         '../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',
       ],
     },
   ],
 }