summaryrefslogtreecommitdiffstats
path: root/jingle/jingle.gyp
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-24 18:08:46 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-24 18:08:46 +0000
commit40eb07fda546a23dcbd07e9e8a68d1d1d9c2ef9a (patch)
tree3a598ff7a461d42ba7cf6a3907ae3ad32bafbd12 /jingle/jingle.gyp
parent66e2c28c1f940c38f54fc042b625c11d63375b48 (diff)
downloadchromium_src-40eb07fda546a23dcbd07e9e8a68d1d1d9c2ef9a.zip
chromium_src-40eb07fda546a23dcbd07e9e8a68d1d1d9c2ef9a.tar.gz
chromium_src-40eb07fda546a23dcbd07e9e8a68d1d1d9c2ef9a.tar.bz2
Move TaskPump class from jingle/notifier/base to jingle/glue
BUG=137140 Review URL: https://chromiumcodereview.appspot.com/10809066 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148142 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle/jingle.gyp')
-rw-r--r--jingle/jingle.gyp10
1 files changed, 5 insertions, 5 deletions
diff --git a/jingle/jingle.gyp b/jingle/jingle.gyp
index c245432..7902678 100644
--- a/jingle/jingle.gyp
+++ b/jingle/jingle.gyp
@@ -23,6 +23,8 @@
'glue/pseudotcp_adapter.cc',
'glue/pseudotcp_adapter.h',
'glue/resolving_client_socket_factory.h',
+ 'glue/task_pump.cc',
+ 'glue/task_pump.h',
'glue/thread_wrapper.cc',
'glue/thread_wrapper.h',
'glue/utils.cc',
@@ -61,8 +63,6 @@
'notifier/base/notifier_options_util.h',
'notifier/base/server_information.cc',
'notifier/base/server_information.h',
- 'notifier/base/task_pump.cc',
- 'notifier/base/task_pump.h',
'notifier/base/weak_xmpp_client.cc',
'notifier/base/weak_xmpp_client.h',
'notifier/base/xmpp_connection.cc',
@@ -124,8 +124,6 @@
'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',
@@ -161,10 +159,12 @@
'glue/jingle_glue_mock_objects.cc',
'glue/jingle_glue_mock_objects.h',
'glue/logging_unittest.cc',
+ 'glue/mock_task.cc',
+ 'glue/mock_task.h',
'glue/proxy_resolving_client_socket_unittest.cc',
'glue/pseudotcp_adapter_unittest.cc',
+ 'glue/task_pump_unittest.cc',
'glue/thread_wrapper_unittest.cc',
- 'notifier/base/task_pump_unittest.cc',
'notifier/base/weak_xmpp_client_unittest.cc',
'notifier/base/xmpp_connection_unittest.cc',
'notifier/communicator/connection_settings_unittest.cc',