[Sync] Fix race condition in P2PNotifier with sending notifications

jingle/notifier/listener/talk_mediator_impl.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/notifier/listener/talk_mediator_impl.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "jingle/notifier/base/notifier_options_util.h"
 
@@ skipping 27 matching lines @@
   }
   return false;
 }
 
 bool TalkMediatorImpl::Logout() {
   CheckOrSetValidThread();
   if (state_.started) {
     state_.started = 0;
     state_.logging_in = 0;
     state_.logged_in = 0;
-    state_.subscribed = 0;
     // We do not want to be called back during logout since we may be
     // closing.
     mediator_thread_->RemoveObserver(this);
     mediator_thread_->Logout();
     return true;
   }
   return false;
 }
 
-bool TalkMediatorImpl::SendNotification(const Notification& data) {
+void TalkMediatorImpl::SendNotification(const Notification& data) {
   CheckOrSetValidThread();
-  if (state_.logged_in && state_.subscribed) {
-    mediator_thread_->SendNotification(data);
-    return true;
-  }
-  return false;
+  mediator_thread_->SendNotification(data);
 }
 
 void TalkMediatorImpl::SetDelegate(TalkMediator::Delegate* delegate) {
   DCHECK_EQ(MessageLoop::current(), construction_message_loop_);
   delegate_ = delegate;
 }
 
 void TalkMediatorImpl::SetAuthToken(const std::string& email,
                                     const std::string& token,
                                     const std::string& token_service) {
@@ skipping 34 matching lines @@
     // Now subscribe for updates to all the services we are interested in
     mediator_thread_->SubscribeForUpdates(subscriptions_);
   } else {
     VLOG(1) << "P2P: Logged off.";
     OnSubscriptionStateChange(false);
   }
 }
 
 void TalkMediatorImpl::OnSubscriptionStateChange(bool subscribed) {
   CheckOrSetValidThread();
-  state_.subscribed = subscribed;
   VLOG(1) << "P2P: " << (subscribed ? "subscribed" : "unsubscribed");
   if (delegate_)
     delegate_->OnNotificationStateChange(subscribed);
 }
 
 void TalkMediatorImpl::OnIncomingNotification(
     const Notification& notification) {
   CheckOrSetValidThread();
   VLOG(1) << "P2P: Updates are available on the server.";
   if (delegate_)
@@ skipping 10 matching lines @@
 
 void TalkMediatorImpl::CheckOrSetValidThread() {
   if (method_message_loop_) {
     DCHECK_EQ(MessageLoop::current(), method_message_loop_);
   } else {
     method_message_loop_ = MessageLoop::current();
   }
 }
 
 }  // namespace notifier