Fix sync E2E tests due to unclosed avatar windows.

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync/test/integration/sync_test.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 26 matching lines @@
 #include "chrome/browser/sync/test/integration/p2p_invalidation_forwarder.h"
 #include "chrome/browser/sync/test/integration/p2p_sync_refresher.h"
 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
 #include "chrome/browser/sync/test/integration/single_client_status_change_checker.h"
 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h"
 #include "chrome/browser/ui/browser.h"
 #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"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/bookmarks/test/bookmark_test_helpers.h"
 #include "components/google/core/browser/google_url_tracker.h"
 #include "components/invalidation/impl/invalidation_switches.h"
@@ skipping 512 matching lines @@
 
     // OneClickSigninSyncStarter observer is created with a real user sign in.
     // It is deleted on certain conditions which are not satisfied by our tests,
     // and this causes the SigninTracker observer to stay hanging at shutdown.
     // Calling LoginUIService::SyncConfirmationUIClosed forces the observer to
     // be removed. http://crbug.com/484388
     for (int i = 0; i < num_clients_; ++i) {
       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;
 }
 
 void SyncTest::TearDownOnMainThread() {
   for (size_t i = 0; i < clients_.size(); ++i) {
     clients_[i]->service()->RequestStop(ProfileSyncService::CLEAR_DATA);
   }
 
@@ skipping 472 matching lines @@
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_SYNC_REFRESH_LOCAL,
       content::Source<Profile>(GetProfile(index)),
       content::Details<const syncer::ModelTypeSet>(&model_types));
 }
 
 void SyncTest::SetPreexistingPreferencesFileContents(
     const std::string& contents) {
   preexisting_preferences_file_contents_ = contents;
 }