Exclude profile_window.h from Android entirely.

Fix includes in chrome_signin_client.cc.

Change-Id: I22bdfd9a625ed7e57cab49f61004d2334dea066a
Reviewed-on: https://chromium-review.googlesource.com/1124108Reviewed-by: David Roger <droger@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#572290}

chrome/browser/profiles/profile_window.h

@@ -15,7 +15,12 @@
 #include "chrome/browser/ui/profile_chooser_constants.h"
 #include "chrome/browser/ui/startup/startup_types.h"
 
+#if defined(OS_ANDROID)
+#error "Not used on Android"
+#endif
+
 class Profile;
+
 namespace base { class FilePath; }
 
 namespace profiles {
@@ -64,7 +69,6 @@ void OpenBrowserWindowForProfile(ProfileManager::CreateCallback callback,
                                  Profile* profile,
                                  Profile::CreateStatus status);
 
-#if !defined(OS_ANDROID)
 // Loads the specified profile given by |path| asynchronously. Once profile is
 // loaded and initialized it runs |callback| if it isn't null.
 void LoadProfileAsync(const base::FilePath& path,
@@ -81,7 +85,6 @@ void SwitchToProfile(const base::FilePath& path,
 
 // Opens a Browser for the guest profile and runs |callback| if it isn't null.
 void SwitchToGuestProfile(ProfileManager::CreateCallback callback);
-#endif
 
 // Returns true if |profile| has potential profile switch targets, ie there's at
 // least one other profile available to switch to, not counting guest. This is

chrome/browser/signin/chrome_signin_client.cc

@@ -22,7 +22,6 @@
 #include "chrome/browser/profiles/profile_attributes_storage.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profile_metrics.h"
-#include "chrome/browser/profiles/profile_window.h"
 #include "chrome/browser/signin/account_consistency_mode_manager.h"
 #include "chrome/browser/signin/force_signin_verifier.h"
 #include "chrome/browser/signin/local_auth.h"
@@ -61,12 +60,15 @@
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "components/user_manager/known_user.h"
 #include "components/user_manager/user_manager.h"
-#else
-#include "chrome/browser/ui/user_manager.h"
 #endif
 
 #if !defined(OS_ANDROID)
 #include "chrome/browser/first_run/first_run.h"
+#include "chrome/browser/profiles/profile_window.h"
+#endif
+
+#if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
+#include "chrome/browser/ui/user_manager.h"
 #endif
 
 ChromeSigninClient::ChromeSigninClient(