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

chrome/browser/sync/profile_sync_service.h

Index: chrome/browser/sync/profile_sync_service.h
diff --git a/chrome/browser/sync/profile_sync_service.h b/chrome/browser/sync/profile_sync_service.h
index 2b1d7edb325ee88489bb49758237fbd3b6218867..b4ea129508e7136dba6b3a0052b3ec268631d3a1 100644
--- a/chrome/browser/sync/profile_sync_service.h
+++ b/chrome/browser/sync/profile_sync_service.h
@@ -247,9 +247,7 @@ class ProfileSyncService : public browser_sync::SyncFrontend,
   browser_sync::SyncBackendHost::StatusSummary QuerySyncStatusSummary();
   virtual browser_sync::SyncBackendHost::Status QueryDetailedSyncStatus();
 
-  const GoogleServiceAuthError& GetAuthError() const {
-    return last_auth_error_;
-  }
+  virtual const GoogleServiceAuthError& GetAuthError() const;
 
   // Displays a dialog for the user to enter GAIA credentials and attempt
   // re-authentication, and returns true if it actually opened the dialog.
@@ -301,9 +299,7 @@ class ProfileSyncService : public browser_sync::SyncFrontend,
     return unrecoverable_error_location_;
   }
 
-  bool UIShouldDepictAuthInProgress() const {
-    return is_auth_in_progress_;
-  }
+  virtual bool UIShouldDepictAuthInProgress() const;
 
   // Returns true if OnPassphraseRequired has been called for any reason.
   virtual bool IsPassphraseRequired() const;