summaryrefslogtreecommitdiffstats
path: root/remoting/remoting.gyp
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-28 02:14:12 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-28 02:14:12 +0000
commit0f935491a6bb96ebad37266ce4f5fb98657c1391 (patch)
treef2ba72e83ef7f9782e80643ccebacae11116b3fc /remoting/remoting.gyp
parent087574ee809adadd4001fceb330e7954a1c65d8e (diff)
downloadchromium_src-0f935491a6bb96ebad37266ce4f5fb98657c1391.zip
chromium_src-0f935491a6bb96ebad37266ce4f5fb98657c1391.tar.gz
chromium_src-0f935491a6bb96ebad37266ce4f5fb98657c1391.tar.bz2
Jingle_glue bugfixes.
Fixed Closed() methods in JingleChannel and JingleClient so that they are not blocking and guarantee that callback is not called afterwards. Changed JingleThread shutdown mechanism so that the thread doesn't stop until all tasks are finished. JingleClient now uses LocalTunnelSessionClient that allows local connections. BUG=52889 TEST=unittests Review URL: http://codereview.chromium.org/3167047 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57770 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/remoting.gyp')
-rw-r--r--remoting/remoting.gyp3
1 files changed, 2 insertions, 1 deletions
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index eed4d58..9754ddf2 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -370,8 +370,9 @@
'host/mock_objects.h',
'host/session_manager_unittest.cc',
'host/test_key_pair.h',
- 'jingle_glue/jingle_thread_unittest.cc',
+ 'jingle_glue/jingle_client_unittest.cc',
'jingle_glue/jingle_channel_unittest.cc',
+ 'jingle_glue/jingle_thread_unittest.cc',
'jingle_glue/iq_request_unittest.cc',
'jingle_glue/mock_objects.h',
'run_all_unittests.cc',