sync: remove GetAuthenticatedUsername from ProfileSyncService/SyncBackendHost.

chrome/browser/sync/sync_global_error_unittest.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_global_error.h"
 
 #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"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::Return;
 using ::testing::NiceMock;
 using content::BrowserThread;
 
 namespace {
 
 // Utility function to test that SyncGlobalError behaves correct for the given
 // error condition.
 void VerifySyncGlobalErrorResult(NiceMock<ProfileSyncServiceMock>* service,
                                  SyncGlobalError* error,
                                  GoogleServiceAuthError::State error_state,
                                  bool is_signed_in,
                                  bool is_error) {
   GoogleServiceAuthError auth_error(error_state);
   service->UpdateAuthErrorState(auth_error);
 
   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();
 
   // If there is an error then a wrench button badge, menu item, and bubble view
   // should be shown.
   EXPECT_EQ(error->HasBadge(), is_error);
   EXPECT_EQ(error->HasMenuItem() || error->HasCustomizedSyncMenuItem(),
             is_error);
   EXPECT_EQ(error->HasBubbleView(), is_error);
 
@@ skipping 10 matching lines @@
   // Test message handler.
   if (is_error) {
     EXPECT_CALL(*service, ShowErrorUI());
     error->ExecuteMenuItem(NULL);
     EXPECT_CALL(*service, ShowErrorUI());
     error->BubbleViewAcceptButtonPressed();
     error->BubbleViewDidClose();
   }
 }
 
+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())
               .WillRepeatedly(Return(true));
   EXPECT_CALL(service, IsPassphraseRequiredForDecryption())
               .WillRepeatedly(Return(true));
   VerifySyncGlobalErrorResult(
       &service, &error, GoogleServiceAuthError::NONE, true, true);
 }
 
 // Test that SyncGlobalError shows an error for conditions that can be resolved
 // by the user and suppresses errors for conditions that  cannot be resolved by
 // the user.
 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;
   EXPECT_CALL(service, QueryDetailedSyncStatus())
               .WillRepeatedly(Return(status));
 
   struct {
     GoogleServiceAuthError::State error_state;
     bool is_error;
   } table[] = {
@@ skipping 10 matching lines @@
     { GoogleServiceAuthError::HOSTED_NOT_ALLOWED, true },
   };
 
   for (size_t i = 0; i < sizeof(table)/sizeof(*table); ++i) {
     VerifySyncGlobalErrorResult(
         &service, &error, table[i].error_state, true, table[i].is_error);
     VerifySyncGlobalErrorResult(
         &service, &error, table[i].error_state, false, false);
   }
 }