Make login code not depend on Ash when use_athena=1

chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc

Index: chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc
diff --git a/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc b/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc
index b3d42cb924a448784d6b7b9444b3c61b5242eb06..4a682dec9eaf6d940959d819cbafeb62c2b8e55e 100644
--- a/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc
+++ b/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc
@@ -7,7 +7,6 @@
 #include <cstddef>
 #include <set>
 
-#include "ash/multi_profile_uma.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
@@ -60,6 +59,7 @@
 #include "ui/wm/core/wm_core_switches.h"
 
 #if !defined(USE_ATHENA)
+#include "ash/multi_profile_uma.h"
 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
 #endif
 
@@ -1062,12 +1062,14 @@ void ChromeUserManagerImpl::OnUserNotAllowed(const std::string& user_email) {
 }
 
 void ChromeUserManagerImpl::UpdateNumberOfUsers() {
+#if !defined(USE_ATHENA)
   size_t users = GetLoggedInUsers().size();
   if (users) {
     // Write the user number as UMA stat when a multi user session is possible.
     if ((users + GetUsersAllowedForMultiProfile().size()) > 1)
       ash::MultiProfileUMA::RecordUserCount(users);
   }
+#endif
 
   base::debug::SetCrashKeyValue(
       crash_keys::kNumberOfUsers,