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

jingle/notifier/listener/mediator_thread_impl.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 "jingle/notifier/listener/mediator_thread_impl.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
-#include "base/task.h"
 #include "jingle/notifier/base/task_pump.h"
 #include "jingle/notifier/communicator/connection_options.h"
 #include "jingle/notifier/communicator/const_communicator.h"
 #include "jingle/notifier/communicator/xmpp_connection_generator.h"
 #include "jingle/notifier/listener/listen_task.h"
 #include "jingle/notifier/listener/send_update_task.h"
 #include "jingle/notifier/listener/subscribe_task.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/host_resolver.h"
 #include "talk/xmpp/xmppclientsettings.h"
 
-// We manage the lifetime of notifier::MediatorThreadImpl ourselves.
-DISABLE_RUNNABLE_METHOD_REFCOUNT(notifier::MediatorThreadImpl);
-
 namespace notifier {
 
 MediatorThreadImpl::MediatorThreadImpl(const NotifierOptions& notifier_options)
     : observers_(new ObserverListThreadSafe<Observer>()),
       parent_message_loop_(MessageLoop::current()),
       notifier_options_(notifier_options),
       worker_thread_("MediatorThread worker thread") {
   DCHECK(parent_message_loop_);
 }
 
@@ skipping 199 matching lines @@
   base_task_.reset();
   observers_->Notify(&Observer::OnConnectionStateChange, false);
 }
 
 void MediatorThreadImpl::OnSubscriptionStateChange(bool success) {
   DCHECK_EQ(MessageLoop::current(), worker_message_loop());
   observers_->Notify(&Observer::OnSubscriptionStateChange, success);
 }
 
 }  // namespace notifier