Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5672)

Unified Diff: chrome/browser/sync/test/integration/sync_test.cc

Issue 1311123003: Fix sync E2E tests due to unclosed avatar windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix mac issue Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/sync/test/DEPS ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..fdd5993b41000f3f289e5cba6bb01509f8e9cce5 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"
@@ -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.
Nicolas Zea 2015/08/31 22:45:01 nit: fix indent
shadi 2015/08/31 23:25:28 Done.
+#if defined(FRAME_AVATAR_BUTTON)
+ ProfileChooserView::Hide();
+#endif // defined(FRAME_AVATAR_BUTTON)
}
return true;
« no previous file with comments | « chrome/browser/sync/test/DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698