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

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/sync/profile_sync_service_mock.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::ReturnRef;
 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")));
   }
 
-  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
   // should be shown.
   EXPECT_EQ(error->HasBadge(), is_error);
   EXPECT_EQ(error->HasMenuItem() || error->HasCustomizedSyncMenuItem(),
             is_error);
   EXPECT_EQ(error->HasBubbleView(), is_error);
 
   // If there is an error then labels should not be empty.
@@ skipping 63 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);
   }
 }