sync: remove GetAuthenticatedUsername from ProfileSyncService/SyncBackendHost.

chrome/browser/sync/sync_global_error_unittest.cc

Index: chrome/browser/sync/sync_global_error_unittest.cc
diff --git a/chrome/browser/sync/sync_global_error_unittest.cc b/chrome/browser/sync/sync_global_error_unittest.cc
index 0215151f2b613049d4af817449ab91513c6db56e..7f33e628fb0bb99a6948c9aa8a02d4839d8a1969 100644
--- a/chrome/browser/sync/sync_global_error_unittest.cc
+++ b/chrome/browser/sync/sync_global_error_unittest.cc
@@ -6,7 +6,12 @@
 
 #include "base/basictypes.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/prefs/pref_service_mock_builder.h"
+#include "chrome/browser/prefs/testing_pref_store.h"
 #include "chrome/browser/sync/profile_sync_service_mock.h"
+#include "chrome/browser/sync/signin_manager.h"
+#include "chrome/common/pref_names.h"
+#include "chrome/test/base/testing_profile.h"
 #include "content/test/test_browser_thread.h"
 #include "testing/gmock/include/gmock/gmock-actions.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ -30,13 +35,6 @@ void VerifySyncGlobalErrorResult(NiceMock<ProfileSyncServiceMock>* service,
 
   EXPECT_CALL(*service, HasSyncSetupCompleted())
               .WillRepeatedly(Return(is_signed_in));
-  if (error_state == GoogleServiceAuthError::SERVICE_UNAVAILABLE) {
-    EXPECT_CALL(*service, GetAuthenticatedUsername())
-                .WillRepeatedly(Return(UTF8ToUTF16("")));
-  } else {
-    EXPECT_CALL(*service, GetAuthenticatedUsername())
-                .WillRepeatedly(Return(UTF8ToUTF16("foo")));
-  }
 
   error->OnStateChanged();
 
@@ -67,13 +65,25 @@ void VerifySyncGlobalErrorResult(NiceMock<ProfileSyncServiceMock>* service,
   }
 }
 
+Profile* MakeProfile() {
+  TestingProfile* profile = new TestingProfile();
+  TestingPrefStore* user_prefs = new TestingPrefStore();
+  PrefService* prefs = PrefServiceMockBuilder()
+      .WithUserPrefs(user_prefs)
+      .Create();
+  profile->SetPrefService(prefs);
+  SigninManager::RegisterUserPrefs(prefs);
+  user_prefs->SetString(prefs::kGoogleServicesUsername, "foo");
+  return profile;
+}
+
 } // namespace
 
 // Test that SyncGlobalError shows an error if a passphrase is required.
 TEST(SyncGlobalErrorTest, PassphraseGlobalError) {
   MessageLoopForUI message_loop;
   content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop);
-  NiceMock<ProfileSyncServiceMock> service;
+  NiceMock<ProfileSyncServiceMock> service(MakeProfile());
   SyncGlobalError error(&service);
 
   EXPECT_CALL(service, IsPassphraseRequired())
@@ -90,7 +100,7 @@ TEST(SyncGlobalErrorTest, PassphraseGlobalError) {
 TEST(SyncGlobalErrorTest, AuthStateGlobalError) {
   MessageLoopForUI message_loop;
   content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop);
-  NiceMock<ProfileSyncServiceMock> service;
+  NiceMock<ProfileSyncServiceMock> service(MakeProfile());
   SyncGlobalError error(&service);
 
   browser_sync::SyncBackendHost::Status status;