Rewrote handing of auto-reconnection and network changes for sync notifier.

chrome/browser/sync/notifier/server_notifier_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 "chrome/browser/sync/notifier/server_notifier_thread.h"
 
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
 #include "chrome/browser/sync/notifier/chrome_invalidation_client.h"
 #include "jingle/notifier/listener/notification_defines.h"
 
 namespace sync_notifier {
 
 ServerNotifierThread::ServerNotifierThread(bool use_chrome_async_socket)
     : notifier::MediatorThreadImpl(use_chrome_async_socket),
-      state_(notifier::STATE_CLOSED) {}
+      state_(notifier::STATE_DISCONNECTED) {}
 
 ServerNotifierThread::~ServerNotifierThread() {}
 
 void ServerNotifierThread::ListenForUpdates() {
   DCHECK_EQ(MessageLoop::current(), parent_message_loop_);
   worker_message_loop()->PostTask(
       FROM_HERE,
       NewRunnableMethod(this,
                         &ServerNotifierThread::StartInvalidationListener));
 }
@@ skipping 41 matching lines @@
       FROM_HERE,
       NewRunnableMethod(
           this,
           &ServerNotifierThread::SignalIncomingNotification));
 }
 
 void ServerNotifierThread::OnClientStateChangeMessage(
     notifier::LoginConnectionState state) {
   DCHECK_EQ(MessageLoop::current(), worker_message_loop());
   state_ = state;
-  if (state_ != notifier::STATE_OPENED) {
-    // Assume anything but an opened state invalidates xmpp_client().
+  if (state_ != notifier::STATE_CONNECTED) {
     StopInvalidationListener();
   }
   MediatorThreadImpl::OnClientStateChangeMessage(state);
 }
 
 void ServerNotifierThread::StartInvalidationListener() {
   DCHECK_EQ(MessageLoop::current(), worker_message_loop());
-  if (state_ != notifier::STATE_OPENED) {
+  if (state_ != notifier::STATE_CONNECTED) {
     return;
   }
   buzz::XmppClient* client = xmpp_client();
   if (client == NULL) {
     LOG(DFATAL) << "xmpp_client() unexpectedly NULL";
     return;
   }
 
   StopInvalidationListener();
   chrome_invalidation_client_.reset(new ChromeInvalidationClient());
 
   // TODO(akalin): Make cache_guid() part of the client ID.  If we do
   // so and we somehow propagate it up to the server somehow, we can
   // make it so that we won't receive any notifications that were
   // generated from our own changes.
   const std::string kClientId = "server_notifier_thread";
   chrome_invalidation_client_->Start(kClientId, this, client);
 }
 
 void ServerNotifierThread::RegisterTypesAndSignalSubscribed() {
   DCHECK_EQ(MessageLoop::current(), worker_message_loop());
-  if (state_ != notifier::STATE_OPENED) {
+  if (state_ != notifier::STATE_CONNECTED) {
     return;
   }
 
   chrome_invalidation_client_->RegisterTypes();
   parent_message_loop_->PostTask(
       FROM_HERE,
       NewRunnableMethod(
           this,
           &ServerNotifierThread::SignalSubscribed));
 }
@@ skipping 13 matching lines @@
     delegate_->OnIncomingNotification(notification_data);
   }
 }
 
 void ServerNotifierThread::StopInvalidationListener() {
   DCHECK_EQ(MessageLoop::current(), worker_message_loop());
   chrome_invalidation_client_.reset();
 }
 
 }  // namespace sync_notifier