diff options
| author | ronghuawu@chromium.org <ronghuawu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-13 17:43:11 +0000 |
|---|---|---|
| committer | ronghuawu@chromium.org <ronghuawu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-13 17:43:11 +0000 |
| commit | 3c616af847bf840951a7f1821d02321de819e028 (patch) | |
| tree | 8a5042813e97c38934bffecf9d0df4492f23c50b /jingle | |
| parent | fea38fc937f7b837c63a71540913e6ef98e794a6 (diff) | |
| download | chromium_src-3c616af847bf840951a7f1821d02321de819e028.zip chromium_src-3c616af847bf840951a7f1821d02321de819e028.tar.gz chromium_src-3c616af847bf840951a7f1821d02321de819e028.tar.bz2 | |
Update libjingle to 153.
Remove the overrides for thread and messagequeue.
Review URL: https://chromiumcodereview.appspot.com/10534122
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141908 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle')
| -rw-r--r-- | jingle/glue/thread_wrapper.cc | 5 | ||||
| -rw-r--r-- | jingle/glue/thread_wrapper.h | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/jingle/glue/thread_wrapper.cc b/jingle/glue/thread_wrapper.cc index e31f8de..c63f89a 100644 --- a/jingle/glue/thread_wrapper.cc +++ b/jingle/glue/thread_wrapper.cc @@ -8,6 +8,7 @@ #include "base/bind_helpers.h" #include "base/lazy_instance.h" #include "base/threading/thread_local.h" +#include "third_party/libjingle/source/talk/base/nullsocketserver.h" namespace jingle_glue { @@ -43,7 +44,7 @@ JingleThreadWrapper* JingleThreadWrapper::current() { } JingleThreadWrapper::JingleThreadWrapper(MessageLoop* message_loop) - : talk_base::Thread(NULL), + : talk_base::Thread(new talk_base::NullSocketServer()), message_loop_(message_loop), send_allowed_(false), last_task_id_(0), @@ -69,7 +70,9 @@ void JingleThreadWrapper::WillDestroyCurrentMessageLoop() { talk_base::ThreadManager::Instance()->SetCurrentThread(NULL); talk_base::MessageQueueManager::Instance()->Remove(this); message_loop_->RemoveDestructionObserver(this); + talk_base::SocketServer* ss = socketserver(); delete this; + delete ss; } void JingleThreadWrapper::Post( diff --git a/jingle/glue/thread_wrapper.h b/jingle/glue/thread_wrapper.h index 553dbbd..284c762 100644 --- a/jingle/glue/thread_wrapper.h +++ b/jingle/glue/thread_wrapper.h @@ -12,7 +12,7 @@ #include "base/message_loop.h" #include "base/synchronization/lock.h" #include "base/synchronization/waitable_event.h" -#include "third_party/libjingle/overrides/talk/base/thread.h" +#include "third_party/libjingle/source/talk/base/thread.h" namespace jingle_glue { |