Fix crash in JingleThread caused by non-nestable tasks.

remoting/jingle_glue/jingle_thread.cc

 // Copyright (c) 2010 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 "remoting/jingle_glue/jingle_thread.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/message_pump.h"
 #include "base/time.h"
@@ skipping 24 matching lines @@
 
     // Clear currently pending messages in case there were delayed tasks.
     // Will schedule it again from ScheduleNextDelayedTask() if neccessary.
     thread_->Clear(this, kRunTasksMessageId);
 
     // This code is executed whenever we get new message in |message_loop_|.
     // JingleMessagePump posts new tasks in the jingle thread.
     // TODO(sergeyu): Remove it when JingleThread moved on Chromium's
     // base::Thread.
     base::MessagePump::Delegate* delegate = thread_->message_loop();
-    // Loop until we run out of work.
-    while (true) {
-      if (!delegate->DoWork())
-        break;
-    }
-
     // Process all pending tasks.
     while (true) {
       if (delegate->DoWork())
         continue;
       if (delegate->DoDelayedWork(&delayed_work_time_))
         continue;
       break;
     }
 
     ScheduleNextDelayedTask();
   }
 
  private:
-
   void ScheduleNextDelayedTask() {
     DCHECK_EQ(thread_->message_loop(), MessageLoop::current());
 
     if (!delayed_work_time_.is_null()) {
       base::TimeTicks now = base::TimeTicks::Now();
       int delay = static_cast<int>((delayed_work_time_ - now).InMilliseconds());
       if (delay > 0) {
         thread_->PostDelayed(delay, this, kRunTasksMessageId);
       } else {
         thread_->Post(this, kRunTasksMessageId);
       }
     }
   }
 
   JingleThread* thread_;
   base::TimeTicks delayed_work_time_;
 };
 
 class JingleThread::JingleMessageLoop : public MessageLoop {
  public:
   JingleMessageLoop(JingleThread* thread)
       : MessageLoop(MessageLoop::TYPE_IO) {
     pump_ = new JingleMessagePump(thread);
   }
+
+  void Initialize() {
+    jingle_message_loop_state_.reset(new AutoRunState(this));
+  }
+
+ private:
+  // AutoRunState sets |state_| for this message loop. It needs to be
+  // created here because we never call Run() or RunAllPending() for
+  // the thread.
+  scoped_ptr<AutoRunState> jingle_message_loop_state_;
 };
 
 TaskPump::TaskPump() {
 }
 
 void TaskPump::WakeTasks() {
   talk_base::Thread::Current()->Post(this);
 }
 
 int64 TaskPump::CurrentTime() {
@@ skipping 14 matching lines @@
 JingleThread::~JingleThread() { }
 
 void JingleThread::Start() {
   Thread::Start();
   started_event_.Wait();
 }
 
 void JingleThread::Run() {
   JingleMessageLoop message_loop(this);
   message_loop_ = &message_loop;
+  message_loop.Initialize();

[awong, 2010/12/23 23:02:49]

Do this before assigning it to the member variable. This is mainly OCD...but I
get weirded out by the message_loop_ on the preiovus line, and the message_loop.
on this line...

[Sergey Ulanov, 2010/12/23 23:37:53]

Done.

 
   TaskPump task_pump;
   task_pump_ = &task_pump;
 
   // Signal after we've initialized |message_loop_| and |task_pump_|.
   started_event_.Signal();
 
   Thread::Run();
 
   stopped_event_.Signal();
@@ skipping 27 matching lines @@
   // Stop the thread only if there are no more messages left in the queue,
   // otherwise post another task to try again later.
   if (msgq_.size() > 0 || fPeekKeep_) {
     Post(this, kStopMessageId);
   } else {
     MessageQueue::Quit();
   }
 }
 
 }  // namespace remoting