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

Unified Diff: chrome/browser/profiles/profile_browsertest.cc

Issue 933503004: Always load signin profile on Chrome OS startup. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix build. Created 5 years, 10 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
Index: chrome/browser/profiles/profile_browsertest.cc
diff --git a/chrome/browser/profiles/profile_browsertest.cc b/chrome/browser/profiles/profile_browsertest.cc
index ec06bd71929fa705944f306865d3a136a5c72fd7..7b446860eea680d3bfafc20a4c6d8ac0064c39a6 100644
--- a/chrome/browser/profiles/profile_browsertest.cc
+++ b/chrome/browser/profiles/profile_browsertest.cc
@@ -29,6 +29,7 @@
#include "testing/gtest/include/gtest/gtest.h"
#if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/profiles/profile_helper.h"
#include "chromeos/chromeos_switches.h"
#endif
@@ -359,6 +360,15 @@ IN_PROC_BROWSER_TEST_F(ProfileBrowserTest,
ASSERT_NE(loaded_profiles.size(), 0UL);
Profile* profile = loaded_profiles[0];
+#if defined(OS_CHROMEOS)
+ for (const auto& loaded_profile : loaded_profiles) {
+ if (!chromeos::ProfileHelper::IsSigninProfile(loaded_profile)) {
+ profile = loaded_profile;
+ break;
+ }
+ }
+#endif
+
// This retry loop reduces flakiness due to the fact that this ultimately
// tests whether or not a code path hits a timed wait.
bool succeeded = false;

Powered by Google App Engine
This is Rietveld 408576698