Trim code from sync's ServerConnectionManager

chrome/browser/sync/internal_api/sync_manager.cc

 // Copyright (c) 2012 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/internal_api/sync_manager.h"
 
 #include <string>
 
 #include "base/base64.h"
 #include "base/bind.h"
@@ skipping 663 matching lines @@
 
 SyncManager::ChangeObserver::~ChangeObserver() {}
 
 SyncManager::Observer::~Observer() {}
 
 SyncManager::SyncManager(const std::string& name)
     : data_(new SyncInternal(name)) {}
 
 SyncManager::Status::Status()
     : summary(INVALID),
-      authenticated(false),
-      server_up(false),
-      server_reachable(false),
       notifications_enabled(false),
       notifications_received(0),
       unsynced_count(0),
       conflicting_count(0),
       committed_count(0),
       syncing(false),
       initial_sync_ended(false),
       updates_available(0),
       updates_received(0),
       tombstone_updates_received(0),
@@ skipping 450 matching lines @@
   DCHECK_EQ(credentials.email, share_.name);
   DCHECK(!credentials.email.empty());
   DCHECK(!credentials.sync_token.empty());
 
   observing_ip_address_changes_ = true;
   if (connection_manager()->set_auth_token(credentials.sync_token)) {
     sync_notifier_->UpdateCredentials(
         credentials.email, credentials.sync_token);
     if (!setup_for_test_mode_ && initialized_) {
       if (scheduler())
-        scheduler()->OnCredentialsUpdated();
+        scheduler()->OnServerConnectionErrorFixed();

[rlarocque, 2012/02/08 01:57:29]

This bypasses the check of "connection_code_ == SYNC_AUTH_ERROR" in
SyncScheduler::OnCredentialsUpdated().  Although this looks dangerous, I think
it's perfectly safe.  The fact that UpdateCredentials() returns true only when
the auth token actually changed should ensure that we don't accidentally end up
in a loop pinging the server without exponential backoff.

     }
   }
 }
 
 void SyncManager::SyncInternal::UpdateEnabledTypes() {
   DCHECK(thread_checker_.CalledOnValidThread());
   ModelSafeRoutingInfo routes;
   registrar_->GetModelSafeRoutingInfo(&routes);
   const ModelTypeSet enabled_types = GetRoutingInfoTypes(routes);
   sync_notifier_->UpdateEnabledTypes(enabled_types);
@@ skipping 546 matching lines @@
       base::Bind(&SyncInternal::OnIPAddressChangedImpl,
                  weak_ptr_factory_.GetWeakPtr()),
       kChromeOSNetworkChangeReactionDelayHackMsec);
 #else
   OnIPAddressChangedImpl();
 #endif  // defined(OS_CHROMEOS)
 }
 
 void SyncManager::SyncInternal::OnIPAddressChangedImpl() {
   DCHECK(thread_checker_.CalledOnValidThread());
-  if (scheduler())
-    scheduler()->OnConnectionStatusChange();
+
+  if (scheduler() && (connection_manager()->server_status() ==
+                      browser_sync::HttpResponse::CONNECTION_UNAVAILABLE)) {

[rlarocque, 2012/02/08 01:57:29]

I've moved the check of the most recent server_status to the
ServerConnectionManager.  I know that you and Tim were arguing against this
move, but I was hoping that seeing it in this context where it allows us to
remove lots of code might change your mind.  

Let me know what you think.  I can revert this change if necessary.  

+    scheduler()->OnServerConnectionErrorFixed();
+  }
 }
 
 void SyncManager::SyncInternal::OnServerConnectionEvent(
     const ServerConnectionEvent& event) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  allstatus_.HandleServerConnectionEvent(event);
   if (event.connection_code ==
       browser_sync::HttpResponse::SERVER_CONNECTION_OK) {
     FOR_EACH_OBSERVER(SyncManager::Observer, observers_,
                       OnAuthError(AuthError::None()));
   }
 
   if (event.connection_code == browser_sync::HttpResponse::SYNC_AUTH_ERROR) {
     observing_ip_address_changes_ = false;
     FOR_EACH_OBSERVER(SyncManager::Observer, observers_,
         OnAuthError(AuthError(AuthError::INVALID_GAIA_CREDENTIALS)));
@@ skipping 758 matching lines @@
     lookup->GetDownloadProgress(i.Get(), &marker);
 
     if (marker.token().empty())
       result.Put(i.Get());
 
   }
   return result;
 }
 
 }  // namespace sync_api