[Sync UI] Show only one sync status on personal options page.

chrome/browser/ui/webui/options/personal_options_handler.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/ui/webui/options/personal_options_handler.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
@@ skipping 221 matching lines @@
 void PersonalOptionsHandler::OnStateChanged() {
   string16 status_label;
   string16 link_label;
   ProfileSyncService* service =
       Profile::FromWebUI(web_ui_)->GetProfileSyncService();
   DCHECK(service);
   bool managed = service->IsManaged();
   bool sync_setup_completed = service->HasSyncSetupCompleted();
   bool status_has_error = sync_ui_util::GetStatusLabels(
       service, &status_label, &link_label) == sync_ui_util::SYNC_ERROR;
-  browser_sync::SyncBackendHost::StatusSummary summary =
-      service->QuerySyncStatusSummary();
-
-  // TODO(jhawkins): This is terribly hacky. Sync should pass us this state, but
-  // we have to fix the other callers of
-  // sync_ui_util::GetSyncedStateStatusLabel() to handle returned HTML.
-  if (!status_has_error &&
-      summary == browser_sync::SyncBackendHost::Status::READY &&
-      service->HasSyncSetupCompleted()) {
-    string16 user_name(service->GetAuthenticatedUsername());
-    status_label.assign(l10n_util::GetStringFUTF16(
-        IDS_SYNC_ACCOUNT_SYNCING_TO_USER,
-        user_name,
-        ASCIIToUTF16(chrome::kSyncGoogleDashboardURL)));
-  }
 
   string16 start_stop_button_label;
   bool is_start_stop_button_visible = false;
   bool is_start_stop_button_enabled = false;
   if (sync_setup_completed) {
     start_stop_button_label =
         l10n_util::GetStringUTF16(IDS_SYNC_STOP_SYNCING_BUTTON_LABEL);
 #if defined(OS_CHROMEOS)
     is_start_stop_button_visible = false;
 #else
@@ skipping 146 matching lines @@
     profile_info_list.Append(profile_value);
   }
 
   web_ui_->CallJavascriptFunction("PersonalOptions.setProfilesInfo",
                                   profile_info_list);
 }
 
 void PersonalOptionsHandler::CreateProfile(const ListValue* args) {
   ProfileManager::CreateMultiProfileAsync();
 }