Removed ProfileSyncService::UIShouldDepictAuthInProgress

chrome/browser/sync/sync_global_error.cc

 // Copyright (c) 2012 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 "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_observer.h"
 #include "chrome/browser/sync/sync_ui_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/global_error_service.h"
 #include "chrome/browser/ui/global_error_service_factory.h"
 #include "chrome/common/net/gaia/google_service_auth_error.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 typedef GoogleServiceAuthError AuthError;
 
-SyncGlobalError::SyncGlobalError(ProfileSyncService* service)
-    : service_(service) {
+SyncGlobalError::SyncGlobalError(ProfileSyncService* service,
+                                 SigninManager* signin)
+    : service_(service),
+      signin_(signin) {
+  DCHECK(service_);
+  DCHECK(signin_);
   OnStateChanged();
 }
 
 SyncGlobalError::~SyncGlobalError() {
 }
 
 bool SyncGlobalError::HasBadge() {
   return !menu_label_.empty();
 }
 
@@ skipping 56 matching lines @@
 
 void SyncGlobalError::BubbleViewCancelButtonPressed(Browser* browser) {
   NOTREACHED();
 }
 
 void SyncGlobalError::OnStateChanged() {
   string16 menu_label;
   string16 bubble_message;
   string16 bubble_accept_label;
   sync_ui_util::GetStatusLabelsForSyncGlobalError(
-      service_, &menu_label, &bubble_message, &bubble_accept_label);
+      service_, *signin_, &menu_label, &bubble_message, &bubble_accept_label);
 
   // All the labels should be empty or all of them non-empty.
   DCHECK((menu_label.empty() && bubble_message.empty() &&
           bubble_accept_label.empty()) ||
          (!menu_label.empty() && !bubble_message.empty() &&
           !bubble_accept_label.empty()));
 
   if (menu_label != menu_label_ || bubble_message != bubble_message_ ||
       bubble_accept_label != bubble_accept_label_) {
     menu_label_ = menu_label;
     bubble_message_ = bubble_message;
     bubble_accept_label_ = bubble_accept_label;
 
     // Profile can be NULL during tests.
     Profile* profile = service_->profile();
     if (profile) {
       GlobalErrorServiceFactory::GetForProfile(
           profile)->NotifyErrorsChanged(this);
     }
   }
 }
 
 bool SyncGlobalError::HasCustomizedSyncMenuItem() {
   return !menu_label_.empty();
 }