diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-22 05:25:29 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-22 05:25:29 +0000 |
| commit | 8cd2caff620e9a28c8afa78d2fe9fc6f153f6a78 (patch) | |
| tree | d1ec54520d1faac609dc14db24e6efc4d82c7fa9 /jingle/jingle.gyp | |
| parent | eda9b15026bcaf66cfbf99c4f54ebf4667fcc1ed (diff) | |
| download | chromium_src-8cd2caff620e9a28c8afa78d2fe9fc6f153f6a78.zip chromium_src-8cd2caff620e9a28c8afa78d2fe9fc6f153f6a78.tar.gz chromium_src-8cd2caff620e9a28c8afa78d2fe9fc6f153f6a78.tar.bz2 | |
Revert 138216 - [Sync] Turn notifier::PushClient into an interface
Split the previous implementation into two pieces:
XmppPushClient and NonBlockingPushClient.
Add FakePushClient and FakePushClientObserver.
Remove use of ThreadSafeObserverList.
Add PushClient::CreateDefault() function, which creates a
NonBlockingPushClient for an XmppPushClient.
Dep-inject PushClient into P2PNotifier.
Add some helper functions to notification_defines.{h,cc}.
BUG=76764
TEST=
Review URL: https://chromiumcodereview.appspot.com/10413014
TBR=akalin@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10388227
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138221 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle/jingle.gyp')
| -rw-r--r-- | jingle/jingle.gyp | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/jingle/jingle.gyp b/jingle/jingle.gyp index 3d424a0..9f9af8b 100644 --- a/jingle/jingle.gyp +++ b/jingle/jingle.gyp @@ -75,16 +75,12 @@ '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', @@ -93,8 +89,6 @@ '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', @@ -126,10 +120,6 @@ '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', @@ -170,12 +160,10 @@ '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': [ |