Revert 110905 - Adding parameter to GetStatusLabels to indicate if links are acceptable, as some ...

chrome/browser/sync/sync_global_error_unittest.cc

Index: chrome/browser/sync/sync_global_error_unittest.cc
===================================================================
--- chrome/browser/sync/sync_global_error_unittest.cc	(revision 110908)
+++ chrome/browser/sync/sync_global_error_unittest.cc	(working copy)
@@ -13,7 +13,6 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::Return;
-using ::testing::ReturnRef;
 using ::testing::NiceMock;
 using content::BrowserThread;
 
@@ -26,6 +25,9 @@
                                  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) {
@@ -36,9 +38,6 @@
                 .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