Revert 177136 due to memory error on Mac ASAN

chrome/browser/sync/sync_global_error.cc

Index: chrome/browser/sync/sync_global_error.cc
===================================================================
--- chrome/browser/sync/sync_global_error.cc	(revision 177205)
+++ chrome/browser/sync/sync_global_error.cc	(working copy)
@@ -21,6 +21,8 @@
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
+typedef GoogleServiceAuthError AuthError;
+
 SyncGlobalError::SyncGlobalError(ProfileSyncService* service,
                                  SigninManager* signin)
     : service_(service),
@@ -49,7 +51,7 @@
 }
 
 int SyncGlobalError::MenuItemCommandID() {
-  return IDC_SHOW_SIGNIN_ERROR;
+  return IDC_SHOW_SYNC_ERROR;
 }
 
 string16 SyncGlobalError::MenuItemLabel() {
@@ -57,6 +59,14 @@
 }
 
 void SyncGlobalError::ExecuteMenuItem(Browser* browser) {
+#if defined(OS_CHROMEOS)
+  if (service_->GetAuthError().state() != AuthError::NONE) {
+    DLOG(INFO) << "Signing out the user to fix a sync error.";
+    // TODO(beng): seems like this could just call browser::AttemptUserExit().
+    chrome::ExecuteCommand(browser, IDC_EXIT);
+    return;
+  }
+#endif
   LoginUIService* login_ui = LoginUIServiceFactory::GetForProfile(
       service_->profile());
   if (login_ui->current_login_ui()) {
@@ -125,3 +135,7 @@
     }
   }
 }
+
+bool SyncGlobalError::HasCustomizedSyncMenuItem() {
+  return !menu_label_.empty();
+}