sync: remove GetAuthenticatedUsername from ProfileSyncService/SyncBackendHost.

chrome/browser/sync/sync_setup_flow.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_setup_flow.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ skipping 85 matching lines @@
 // static
 void SyncSetupFlow::GetArgsForGaiaLogin(const ProfileSyncService* service,
                                         DictionaryValue* args) {
   const GoogleServiceAuthError& error = service->GetAuthError();
   if (!service->last_attempted_user_email().empty()) {
     args->SetString("user", service->last_attempted_user_email());
     args->SetInteger("error", error.state());
     args->SetBoolean("editable_user", true);
   } else {
     string16 user;
-    if (!service->cros_user().empty())
-      user = UTF8ToUTF16(service->cros_user());
-    else
-      user = service->GetAuthenticatedUsername();
+    user = UTF8ToUTF16(service->profile()->GetPrefs()->GetString(
+        prefs::kGoogleServicesUsername));

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

I'm slightly nervous about this, as it's not 100% clear to me what the lifetime
of kGoogleServicesUsername is (I want to make sure we don't get into a state
where kGoogleServicesUsername gets set but sync can't sign in, and we're left in
a permanent state where the user can't log in as a different user).

Looks like we're guaranteed to clear out kGoogleServicesUsername if the user
cancels out of the setup dialog before sync setup completes
(PSS::OnUserCancelledDialog), but I'm not sure how this works in the case that
the user gets an auth error back from the server *after* sync setup has already
completed once.

[tim (not reviewing), 2011/11/24 03:59:42]

But in that case the username has to stay the same, so I think it's okay.  I
summarized my take in the cl description, I think that this only gets cleared on
DisableForUser which gets called (as you point out) if you cancel out of setup
or choose to stop syncing.

[Andrew T Wilson (Slow), 2011/11/24 17:14:08]

OK, if you're saying the user always has the option to sign out of sync (even in
the presence of an auth error) then this is fine.

     args->SetString("user", user);
     args->SetInteger("error", 0);
     args->SetBoolean("editable_user", user.empty());
   }
 
   args->SetString("captchaUrl", error.captcha().image_url.spec());
 }
 
 void SyncSetupFlow::GetArgsForConfigure(ProfileSyncService* service,
                                         DictionaryValue* args) {
@@ skipping 369 matching lines @@
       // display the error appropriately (http://crbug.com/92722).
       DictionaryValue args;
       SyncSetupFlow::GetArgsForGaiaLogin(service_, &args);
       args.SetBoolean("fatalError", true);
       current_state_ = SyncSetupWizard::GAIA_LOGIN;
       flow_handler_->ShowGaiaLogin(args);
       break;
     }
     case SyncSetupWizard::DONE:
     case SyncSetupWizard::ABORT:
-      flow_handler_->ShowSetupDone(service_->GetAuthenticatedUsername());
+      flow_handler_->ShowSetupDone(UTF8ToUTF16(
+          service_->profile()->GetPrefs()->GetString(
+          prefs::kGoogleServicesUsername)));
       break;
     default:
       NOTREACHED() << "Invalid advance state: " << state;
   }
 }