Remove OS_CHROMEOS from ui/ash code

chrome/browser/ui/ash/session_util.cc

Index: chrome/browser/ui/ash/session_util.cc
diff --git a/chrome/browser/ui/ash/session_util.cc b/chrome/browser/ui/ash/session_util.cc
index 2b7d0fc6729e7ac20a4a7e1956de3e75a3646d87..4da7d94f2370a0ec53e3bebc49fdc5d9e5486b24 100644
--- a/chrome/browser/ui/ash/session_util.cc
+++ b/chrome/browser/ui/ash/session_util.cc
@@ -8,23 +8,18 @@
 #include "ash/session/session_state_delegate.h"
 #include "ash/shell.h"
 #include "build/build_config.h"
+#include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "components/user_manager/user_manager.h"
 #include "content/public/browser/browser_context.h"
 #include "grit/ash_resources.h"
 #include "ui/aura/window.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image_skia_operations.h"
 
-#if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/profiles/profile_helper.h"
-#include "components/user_manager/user_manager.h"
-#endif
-
 content::BrowserContext* GetActiveBrowserContext() {
-#if defined(OS_CHROMEOS)
   DCHECK(user_manager::UserManager::Get()->GetLoggedInUsers().size());
-#endif
   return ProfileManager::GetActiveUserProfile();
 }
 
@@ -51,19 +46,7 @@ bool CanShowWindowForUser(
   return true;
 }
 
-namespace {
-#if defined(OS_CHROMEOS)
-user_manager::UserInfo* GetUserInfoForContext(
-    content::BrowserContext* context) {
-  return chromeos::ProfileHelper::Get()->GetUserByProfile(
-      Profile::FromBrowserContext(context));
-}
-#endif
-
-}  // namespace
-
 gfx::ImageSkia GetAvatarImageForContext(content::BrowserContext* context) {
-#if defined(OS_CHROMEOS)
   static const gfx::ImageSkia* holder =
       ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
           IDR_AVATAR_HOLDER);
@@ -71,13 +54,14 @@ gfx::ImageSkia GetAvatarImageForContext(content::BrowserContext* context) {
       ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
           IDR_AVATAR_HOLDER_MASK);
 
-  gfx::ImageSkia user_image = GetUserInfoForContext(context)->GetImage();
+  gfx::ImageSkia user_image =
+      chromeos::ProfileHelper::Get()
+          ->GetUserByProfile(Profile::FromBrowserContext(context))
+          ->GetImage();
+
   gfx::ImageSkia resized = gfx::ImageSkiaOperations::CreateResizedImage(
       user_image, skia::ImageOperations::RESIZE_BEST, holder->size());
   gfx::ImageSkia masked =
       gfx::ImageSkiaOperations::CreateMaskedImage(resized, *holder_mask);
   return gfx::ImageSkiaOperations::CreateSuperimposedImage(*holder, masked);
-#else
-  return gfx::ImageSkia();
-#endif
 }