Fix sync E2E tests due to unclosed avatar windows.

chrome/browser/sync/test/integration/sync_test.cc

Index: chrome/browser/sync/test/integration/sync_test.cc
diff --git a/chrome/browser/sync/test/integration/sync_test.cc b/chrome/browser/sync/test/integration/sync_test.cc
index 1b14af9e2618a419bc42fbe3e60bd2674fb47c43..93a1590130499b3214733743c25a8239583900d4 100644
--- a/chrome/browser/sync/test/integration/sync_test.cc
+++ b/chrome/browser/sync/test/integration/sync_test.cc
@@ -44,6 +44,7 @@
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "chrome/browser/ui/views/profiles/profile_chooser_view.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
 #include "chrome/common/chrome_constants.h"
@@ -577,6 +578,15 @@ bool SyncTest::SetupSync() {
       LoginUIServiceFactory::GetForProfile(GetProfile(i))->
           SyncConfirmationUIClosed(false /* configure_sync_first */);
     }
+
+    // Upon multiple profiles sign in, the profile chooser widget stays open and

[msw, 2015/09/14 17:16:05]

Is this comment still accurate? Isn't the trigger about user_data_dir?

+    // causes problems at test shutdown. This is a harmless command to close
+    // the widget in case it was showing.
+    // ChromeOS and mobile platforms don't have a ProfileChooserView.
+#if defined(FRAME_AVATAR_BUTTON)
+    // TODO(shadi): Remove this hack once crbug.com/527505 is fixed.
+    ProfileChooserView::Hide();
+#endif  // defined(FRAME_AVATAR_BUTTON)
   }
 
   return true;