Adding parameter to GetStatusLabels to indicate if links are acceptable. (Re applied)

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..53374b29a1c9413664cb655a36e783891d5850ff 100644
--- a/chrome/browser/sync/sync_global_error_unittest.cc
+++ b/chrome/browser/sync/sync_global_error_unittest.cc
@@ -13,6 +13,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::Return;
+using ::testing::ReturnRef;
 using ::testing::NiceMock;
 using content::BrowserThread;
 
@@ -25,9 +26,6 @@ void VerifySyncGlobalErrorResult(NiceMock<ProfileSyncServiceMock>* service,
                                  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) {
@@ -38,6 +36,9 @@ void VerifySyncGlobalErrorResult(NiceMock<ProfileSyncServiceMock>* service,
                 .WillRepeatedly(Return(UTF8ToUTF16("foo")));
   }
 
+  GoogleServiceAuthError auth_error(error_state);
+  EXPECT_CALL(*service, GetAuthError()).WillRepeatedly(ReturnRef(auth_error));
+
   error->OnStateChanged();
 
   // If there is an error then a wrench button badge, menu item, and bubble view