[sync] Display an error when sync settings aren't confirmed

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 76 matching lines @@
 bool AvatarButtonErrorController::SyncErrorObserver::HasSyncError() {
   browser_sync::ProfileSyncService* sync_service =
       ProfileSyncServiceFactory::GetForProfile(profile_);
   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());
+           (sync_error_controller && sync_error_controller->HasError()) ||
+           sync_service->IsSyncConfirmationNeeded();
   }
   return false;
 }
 
 SyncErrorController* AvatarButtonErrorController::SyncErrorObserver::
     GetSyncErrorControllerIfNeeded() {
   browser_sync::ProfileSyncService* sync_service =
       ProfileSyncServiceFactory::GetForProfile(profile_);
   return sync_service ? sync_service->sync_error_controller() : nullptr;
 }