Removing pre-material design menu setting.

chrome/browser/ui/avatar_button_error_controller.cc

 // Copyright 2016 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/ui/avatar_button_error_controller.h"
 
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "components/browser_sync/profile_sync_service.h"
 #include "components/signin/core/browser/signin_error_controller.h"
@@ skipping 52 matching lines @@
   const SigninErrorController* signin_error_controller =
       profiles::GetSigninErrorController(profile_);
   return signin_error_controller && signin_error_controller->HasError();
 }
 
 AvatarButtonErrorController::SyncErrorObserver::SyncErrorObserver(
     Profile* profile,
     AvatarButtonErrorController* avatar_button_error_controller)
     : profile_(profile),
       avatar_button_error_controller_(avatar_button_error_controller) {
-  SyncErrorController* sync_error_controller = GetSyncErrorControllerIfNeeded();
-  if (sync_error_controller)
-    sync_error_controller->AddObserver(this);
 }
 
-AvatarButtonErrorController::SyncErrorObserver::~SyncErrorObserver() {
-  SyncErrorController* sync_error_controller = GetSyncErrorControllerIfNeeded();
-  if (sync_error_controller)
-    sync_error_controller->RemoveObserver(this);
-}
+AvatarButtonErrorController::SyncErrorObserver::~SyncErrorObserver() {}
 
 void AvatarButtonErrorController::SyncErrorObserver::OnErrorChanged() {

[sky, 2017/02/23 20:44:52]

Is this function ever called now? Who adds this class as an observer now? If no
one does, does it need to implement SigninErrorController::Observer?

[jlebel, 2017/03/06 13:09:29]

Sorry I definitely made a mistake here. GetSyncErrorControllerIfNeeded() should
not have been removed.

   avatar_button_error_controller_->UpdateSyncError(HasSyncError());
 }
 
 bool AvatarButtonErrorController::SyncErrorObserver::HasSyncError() {
   browser_sync::ProfileSyncService* sync_service =
       ProfileSyncServiceFactory::GetForProfile(profile_);
-  if (switches::IsMaterialDesignUserMenu() && sync_service) {
+  if (sync_service) {
     SyncErrorController* sync_error_controller =
         sync_service->sync_error_controller();
     browser_sync::ProfileSyncService::Status status;
     sync_service->QueryDetailedSyncStatus(&status);
     return sync_service->HasUnrecoverableError() ||
            status.sync_protocol_error.action == syncer::UPGRADE_CLIENT ||
            (sync_error_controller && sync_error_controller->HasError());
   }
   return false;
 }
-
-SyncErrorController* AvatarButtonErrorController::SyncErrorObserver::
-    GetSyncErrorControllerIfNeeded() {
-  if (!switches::IsMaterialDesignUserMenu())
-    return nullptr;
-  browser_sync::ProfileSyncService* sync_service =
-      ProfileSyncServiceFactory::GetForProfile(profile_);
-  return sync_service ? sync_service->sync_error_controller() : nullptr;
-}