sync: remove GetAuthenticatedUsername from ProfileSyncService/SyncBackendHost.

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"
+#include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/protocol/proto_enum_conversions.h"
 #include "chrome/browser/sync/protocol/sync_protocol_error.h"
 #include "chrome/browser/sync/syncable/model_type.h"
 #include "chrome/browser/sync/sessions/session_state.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/net/gaia/google_service_auth_error.h"
+#include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 typedef GoogleServiceAuthError AuthError;
 
 namespace sync_ui_util {
 
 namespace {
 
 // Given an authentication state this helper function returns various labels
 // that can be used to display information about the state.
 void GetStatusLabelsForAuthError(const AuthError& auth_error,
                                  const ProfileSyncService& service,
                                  string16* status_label,
                                  string16* link_label,
                                  string16* global_error_menu_label,
                                  string16* global_error_bubble_message,
                                  string16* global_error_bubble_accept_label) {
+  string16 username = UTF8ToUTF16(service.profile()->GetPrefs()->GetString(
+      prefs::kGoogleServicesUsername));
   string16 product_name = l10n_util::GetStringUTF16(IDS_PRODUCT_NAME);
   if (link_label)
     link_label->assign(l10n_util::GetStringUTF16(IDS_SYNC_RELOGIN_LINK_LABEL));
 
   switch (auth_error.state()) {
     case AuthError::INVALID_GAIA_CREDENTIALS:
     case AuthError::ACCOUNT_DELETED:
     case AuthError::ACCOUNT_DISABLED:
       // If the user name is empty then the first login failed, otherwise the
       // credentials are out-of-date.
-      if (service.GetAuthenticatedUsername().empty()) {
+      if (username.empty()) {
         if (status_label) {
           status_label->assign(
               l10n_util::GetStringUTF16(IDS_SYNC_INVALID_USER_CREDENTIALS));
         }
       } else {
         if (status_label) {
           status_label->assign(
               l10n_util::GetStringUTF16(IDS_SYNC_LOGIN_INFO_OUT_OF_DATE));
         }
         if (global_error_menu_label) {
           global_error_menu_label->assign(l10n_util::GetStringUTF16(
               IDS_SYNC_SIGN_IN_ERROR_WRENCH_MENU_ITEM));
         }
         if (global_error_bubble_message) {
           global_error_bubble_message->assign(l10n_util::GetStringFUTF16(
               IDS_SYNC_SIGN_IN_ERROR_BUBBLE_VIEW_MESSAGE, product_name));
         }
         if (global_error_bubble_accept_label) {
           global_error_bubble_accept_label->assign(l10n_util::GetStringUTF16(
               IDS_SYNC_SIGN_IN_ERROR_BUBBLE_VIEW_ACCEPT));
         }
       }
       break;
     case AuthError::SERVICE_UNAVAILABLE:
-      DCHECK(service.GetAuthenticatedUsername().empty());

[Andrew T Wilson (Slow), 2011/11/24 01:48:16]

Not sure if this is a bogus DCHECK(), but I think it's fine to omit it.

       if (status_label) {
         status_label->assign(
             l10n_util::GetStringUTF16(IDS_SYNC_SERVICE_UNAVAILABLE));
       }
       if (link_label)
         link_label->clear();
       if (global_error_menu_label) {
         global_error_menu_label->assign(l10n_util::GetStringUTF16(
             IDS_SYNC_SIGN_IN_ERROR_WRENCH_MENU_ITEM));
       }
@@ skipping 35 matching lines @@
       }
       break;
   }
 }
 
 // Returns the message that should be displayed when the user is authenticated
 // and can connect to the sync server. If the user hasn't yet authenticated, an
 // empty string is returned.
 string16 GetSyncedStateStatusLabel(ProfileSyncService* service) {
   string16 label;
-  string16 user_name(service->GetAuthenticatedUsername());
-  if (user_name.empty())
-    return label;
+  if (!service->sync_initialized())
+    return string16();
 
+  string16 username = UTF8ToUTF16(service->profile()->GetPrefs()->GetString(
+      prefs::kGoogleServicesUsername));

[Andrew T Wilson (Slow), 2011/11/24 01:48:16]

DCHECK(!username.empty()) ?

   return l10n_util::GetStringFUTF16(
       IDS_SYNC_ACCOUNT_SYNCING_TO_USER,
-      user_name,
+      username,
       ASCIIToUTF16(chrome::kSyncGoogleDashboardURL));
 }
 
 void GetStatusForActionableError(
     const browser_sync::SyncProtocolError& error,
     string16* status_label) {
   DCHECK(status_label);
   switch (error.action) {
     case browser_sync::STOP_AND_RESTART_SYNC:
        status_label->assign(
@@ skipping 533 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