Roll libjingle to r108.

jingle/glue/thread_wrapper.cc

 // Copyright (c) 2011 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.
 
 #include "jingle/glue/thread_wrapper.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/lazy_instance.h"
 #include "base/threading/thread_local.h"
@@ skipping 31 matching lines @@
   return g_jingle_thread_wrapper.Get().Get();
 }
 
 JingleThreadWrapper::JingleThreadWrapper(MessageLoop* message_loop)
     : message_loop_(message_loop),
       send_allowed_(false),
       last_task_id_(0),
       pending_send_event_(true, false) {
   DCHECK_EQ(message_loop_, MessageLoop::current());
 
-  talk_base::ThreadManager::SetCurrent(this);
+  talk_base::Thread* current_thread =
+      talk_base::ThreadManager::Instance()->CurrentThread();
+  if (current_thread) {
+    current_thread->UnwrapCurrent();

[Sergey Ulanov, 2012/01/19 01:36:22]

Add DCHECK(!current_thread->Owned()); here.

+    delete current_thread;
+  }
+  talk_base::ThreadManager::Instance()->SetCurrentThread(this);
   talk_base::MessageQueueManager::Instance()->Add(this);
   message_loop_->AddDestructionObserver(this);
 
   WrapCurrent();
 }
 
 JingleThreadWrapper::~JingleThreadWrapper() {
 }
 
 void JingleThreadWrapper::WillDestroyCurrentMessageLoop() {
   DCHECK_EQ(talk_base::Thread::Current(), current());
   UnwrapCurrent();
   g_jingle_thread_wrapper.Get().Set(NULL);
-  talk_base::ThreadManager::SetCurrent(NULL);
+  talk_base::ThreadManager::Instance()->SetCurrentThread(NULL);
   talk_base::MessageQueueManager::Instance()->Remove(this);
   message_loop_->RemoveDestructionObserver(this);
   delete this;
 }
 
 void JingleThreadWrapper::Post(
     talk_base::MessageHandler* handler, uint32 message_id,
     talk_base::MessageData* data, bool time_sensitive) {
   PostTaskInternal(0, handler, message_id, data);
 }
@@ skipping 210 matching lines @@
 
 void JingleThreadWrapper::Stop() {
   NOTREACHED();
 }
 
 void JingleThreadWrapper::Run() {
   NOTREACHED();
 }
 
 }  // namespace jingle_glue