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 c0f0d85b24592f60bf9aa7e11a3370ae33977b4b..04941b2d41fb425b4399a839dba043210ed3abd7 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"

[msw, 2015/09/01 00:27:20]

Shouldn't this only be included #if defined(TOOLKIT_VIEWS)?

[msw, 2015/09/15 18:17:23]

You never addressed this comment. I'd expect that any non-views platform
including this file (Mac, Android, iOS) would have compile errors.

 #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"
@@ -576,6 +577,14 @@ bool SyncTest::SetupSync() {
       LoginUIServiceFactory::GetForProfile(GetProfile(i))->
           SyncConfirmationUIClosed(false /* configure_sync_first */);
     }
+
+    // Upon multiple profiles sign in, the profile chooser widget stays open and
+    // 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)
+    ProfileChooserView::Hide();

[msw, 2015/09/01 00:27:20]

Instead, try something like ui_test_utils::FocusView(browser,
VIEW_ID_TAB_CONTAINER) or another chrome/test/base/interactive_test_utils.h
helper. A views-specific workaround in this file doesn't seem like the right
fix. sky@ might have better advice if nothing in those test utils helps.

+#endif  // defined(FRAME_AVATAR_BUTTON)
   }
 
   return true;