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

jingle/notifier/listener/mediator_thread_impl.h

Index: jingle/notifier/listener/mediator_thread_impl.h
diff --git a/jingle/notifier/listener/mediator_thread_impl.h b/jingle/notifier/listener/mediator_thread_impl.h
index a4a1de6a348575faa0513d90c83260581dd5d337..302c183197b421db83178105828786091f506b76 100644
--- a/jingle/notifier/listener/mediator_thread_impl.h
+++ b/jingle/notifier/listener/mediator_thread_impl.h
@@ -27,6 +27,7 @@
 #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"
@@ -112,4 +113,7 @@ class MediatorThreadImpl : public MediatorThread, public LoginDelegate,
 
 }  // namespace notifier
 
+// We manage the lifetime of notifier::MediatorThreadImpl ourselves.
+DISABLE_RUNNABLE_METHOD_REFCOUNT(notifier::MediatorThreadImpl);
+
 #endif  // JINGLE_NOTIFIER_LISTENER_MEDIATOR_THREAD_IMPL_H_