Replace direct access to kGoogleServicesUsername with calls to SigninManager.

chrome/browser/sync/profile_sync_service.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/profile_sync_service.h"
 
 #include <cstddef>
 #include <map>
 #include <vector>
 
@@ skipping 2483 matching lines @@
 
 SigninManagerBase* ProfileSyncService::signin() const {
   if (!signin_)
     return NULL;
   return signin_->GetOriginal();
 }
 
 void ProfileSyncService::UnsuppressAndStart() {
   DCHECK(profile_);
   sync_prefs_.SetStartSuppressed(false);
-  if (signin_.get() && !signin_->GetOriginal()->IsAuthenticated()) {
-    signin_->GetOriginal()->SetAuthenticatedUsername(
-        profile_->GetPrefs()->GetString(prefs::kGoogleServicesUsername));
-  }
+  DCHECK(!signin_.get() || signin_->GetOriginal()->IsAuthenticated());
   startup_controller_.TryStart();
 }
 
 void ProfileSyncService::AcknowledgeSyncedTypes() {
   sync_prefs_.AcknowledgeSyncedTypes(GetRegisteredDataTypes());
 }
 
 void ProfileSyncService::ReconfigureDatatypeManager() {
   // If we haven't initialized yet, don't configure the DTM as it could cause
   // association to start before a Directory has even been created.
@@ skipping 244 matching lines @@
 
 base::MessageLoop* ProfileSyncService::GetSyncLoopForTest() const {
   if (sync_thread_) {
     return sync_thread_->message_loop();
   } else if (backend_) {
     return backend_->GetSyncLoopForTesting();
   } else {
     return NULL;
   }
 }