Merge 68891 - [Sync] Fixed sync crash regression in ServerNotifierThread

jingle/notifier/listener/mediator_thread_impl.h

 // 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.
 //
 // This object runs on a thread and knows how to interpret messages sent by the
 // talk mediator. The mediator posts messages to a queue which the thread polls
 // (in a super class).
 //
 // Example usage:
 //
 //   MediatorThread m = new MediatorThreadImpl(pass in stuff);
 //   m.start(); // Start the thread
 //   // Once the thread is started, you can do server stuff.
 //   m.Login(loginInformation);
 //   // Events happen, the mediator finds out through its pump more messages
 //   // are dispatched to the thread eventually we want to log out.
 //   m.Logout();
 //   delete m; // Also stops the thread.
 
 #ifndef JINGLE_NOTIFIER_LISTENER_MEDIATOR_THREAD_IMPL_H_
 #define JINGLE_NOTIFIER_LISTENER_MEDIATOR_THREAD_IMPL_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/observer_list_threadsafe.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
+#include "base/task.h"
 #include "base/thread.h"
 #include "base/weak_ptr.h"
 #include "jingle/notifier/base/notifier_options.h"
 #include "jingle/notifier/communicator/login.h"
 #include "jingle/notifier/listener/mediator_thread.h"
 #include "talk/base/sigslot.h"
 
 class MessageLoop;
 
 namespace buzz {
@@ skipping 65 matching lines @@
   base::Thread worker_thread_;
   scoped_ptr<net::HostResolver> host_resolver_;
 
   scoped_ptr<notifier::Login> login_;
 
   DISALLOW_COPY_AND_ASSIGN(MediatorThreadImpl);
 };
 
 }  // namespace notifier
 
+// We manage the lifetime of notifier::MediatorThreadImpl ourselves.
+DISABLE_RUNNABLE_METHOD_REFCOUNT(notifier::MediatorThreadImpl);
+
 #endif  // JINGLE_NOTIFIER_LISTENER_MEDIATOR_THREAD_IMPL_H_