[Sync] Merge //components/browser_sync into one directory.

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/browser/profile_sync_service.h"
+#include "components/browser_sync/profile_sync_service.h"
 #include "components/signin/core/browser/signin_error_controller.h"
 #include "components/signin/core/common/profile_management_switches.h"
 
 AvatarButtonErrorController::AvatarButtonErrorController(
     AvatarButtonErrorControllerDelegate* delegate,
     Profile* profile)
     : delegate_(delegate),
       avatar_signin_error_controller_(profile, this),
       avatar_sync_error_controller_(profile, this),
       has_signin_error_(avatar_signin_error_controller_.HasSigninError()),
@@ skipping 79 matching lines @@
 }
 
 SyncErrorController* AvatarButtonErrorController::SyncErrorObserver::
     GetSyncErrorControllerIfNeeded() {
   if (!switches::IsMaterialDesignUserMenu())
     return nullptr;
   ProfileSyncService* sync_service =
       ProfileSyncServiceFactory::GetForProfile(profile_);
   return sync_service ? sync_service->sync_error_controller() : nullptr;
 }