Delete lots of sync ServerConnectionManager code

chrome/browser/sync/sync_ui_util.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 "chrome/browser/sync/sync_ui_util.h"
 
 #include "base/i18n/number_formatting.h"
 #include "base/i18n/time_formatting.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 273 matching lines @@
               l10n_util::GetStringUTF16(IDS_SYNC_AUTHENTICATING_LABEL));
         }
       } else if (auth_error.state() != AuthError::NONE &&
                  auth_error.state() != AuthError::TWO_FACTOR) {
         if (status_label) {
           status_label->clear();
           GetStatusLabelsForAuthError(auth_error, *service, status_label, NULL,
                                       NULL, NULL, NULL);
         }
         result_type = SYNC_ERROR;
-      } else if (!status.authenticated) {

[rlarocque, 2012/01/19 02:23:05]

Since status.authenticated correlates mostly with "did the last connection
attempt return 200?", this branch doesn't make a lot of sense to me.  Especially
since this is in the startup case, where a CheckServerReachable() could be
affecting the SCM's state. 

Fred suggested that this might be dead code.  I'm not convinced that it is, but
I'm not sure I care.  I'd rather remove it.

TODO: Figure out if IDS_SYNC_ACCOUNT_DETAILS_NOT_ENTERED is used anywhere else
in order to determine if it should be removed, too.

-        if (status_label) {
-          status_label->assign(
-              l10n_util::GetStringUTF16(IDS_SYNC_ACCOUNT_DETAILS_NOT_ENTERED));
-        }
       }
     } else if (service->unrecoverable_error_detected()) {
       result_type = SYNC_ERROR;
       ProfileSyncService::Status status(service->QueryDetailedSyncStatus());
       if (ShouldShowActionOnUI(status.sync_protocol_error)) {
         if (status_label) {
           GetStatusForActionableError(status.sync_protocol_error,
               status_label);
         }
       } else if (status_label) {
@@ skipping 196 matching lines @@
   } else {
     sync_api::SyncManager::Status full_status(
         service->QueryDetailedSyncStatus());
 
     strings->SetString("service_url", service->sync_service_url().spec());
     strings->SetString("summary",
                        ProfileSyncService::BuildSyncStatusSummaryText(
                        full_status.summary));
 
     strings->SetString("version", GetVersionString());
-    strings->Set("authenticated",
-                 new base::FundamentalValue(full_status.authenticated));
     strings->SetString("auth_problem",
                        sync_ui_util::MakeSyncAuthErrorText(
                        service->GetAuthError().state()));
 
     strings->SetString("time_since_sync", service->GetLastSyncedTimeString());
 
     ListValue* details = new ListValue();
     strings->Set("details", details);
     sync_ui_util::AddBoolSyncDetail(details, "Sync Initialized",
                                     service->sync_initialized());
     sync_ui_util::AddBoolSyncDetail(details, "Sync Setup Has Completed",
                                     service->HasSyncSetupCompleted());
     sync_ui_util::AddStringSyncDetails(
         details,
         "Client ID",
         full_status.unique_id.empty() ? "none" : full_status.unique_id);
     sync_ui_util::AddBoolSyncDetail(details,
-                                    "Server Up",
-                                    full_status.server_up);
-    sync_ui_util::AddBoolSyncDetail(details,
-                                    "Server Reachable",
-                                    full_status.server_reachable);
-    sync_ui_util::AddBoolSyncDetail(details,
                                     "Server Broken",
                                     full_status.server_broken);
     sync_ui_util::AddBoolSyncDetail(details,
                                     "Notifications Enabled",
                                     full_status.notifications_enabled);
     sync_ui_util::AddIntSyncDetail(details,
                                    "Notifications Received",
                                    full_status.notifications_received);
     sync_ui_util::AddIntSyncDetail(details,
                                    "Notifiable Commits",
@@ skipping 156 matching lines @@
     }
   } else {
     version_modifier = " " + version_modifier;
   }
   return chrome_version.Name() + " " + chrome_version.OSType() + " " +
       chrome_version.Version() + " (" + chrome_version.LastChange() + ")" +
       version_modifier;
 }
 
 }  // namespace sync_ui_util