Removed sync error menu item from the wrench menu (material design user menu only)

chrome/browser/sync/sync_global_error.cc

Index: chrome/browser/sync/sync_global_error.cc
diff --git a/chrome/browser/sync/sync_global_error.cc b/chrome/browser/sync/sync_global_error.cc
index fa24ce013b2d69244bf5677fed765f21d4de03a0..82fdf549675013d62ddf6de54a7710d59f92e865 100644
--- a/chrome/browser/sync/sync_global_error.cc
+++ b/chrome/browser/sync/sync_global_error.cc
@@ -14,6 +14,7 @@
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/browser_sync/browser/profile_sync_service.h"
+#include "components/signin/core/common/profile_management_switches.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 #include "ui/base/l10n/l10n_util.h"
 
@@ -27,7 +28,8 @@ SyncGlobalError::SyncGlobalError(GlobalErrorService* global_error_service,
       sync_service_(profile_sync_service) {
   DCHECK(sync_service_);
   error_controller_->AddObserver(this);
-  global_error_service_->AddGlobalError(this);
+  if (!switches::IsMaterialDesignUserMenu())
+    global_error_service_->AddGlobalError(this);
 }
 
 SyncGlobalError::~SyncGlobalError() {
@@ -36,7 +38,8 @@ SyncGlobalError::~SyncGlobalError() {
 }
 
 void SyncGlobalError::Shutdown() {
-  global_error_service_->RemoveGlobalError(this);
+  if (!switches::IsMaterialDesignUserMenu())
+    global_error_service_->RemoveGlobalError(this);
   error_controller_->RemoveObserver(this);
   error_controller_ = NULL;
 }
@@ -94,6 +97,9 @@ void SyncGlobalError::BubbleViewCancelButtonPressed(Browser* browser) {
 }
 
 void SyncGlobalError::OnErrorChanged() {
+  if (switches::IsMaterialDesignUserMenu())
+    return;
+
   base::string16 menu_label;
   base::string16 bubble_message;
   base::string16 bubble_accept_label;