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..57987944fedbe47adc71db2542816b182fe5362a 100644 |
--- a/chrome/browser/profiles/profile_browsertest.cc |
+++ b/chrome/browser/profiles/profile_browsertest.cc |
@@ -15,6 +15,7 @@ |
#include "base/version.h" |
#include "chrome/browser/browser_process.h" |
#include "chrome/browser/chrome_notification_types.h" |
+#include "chrome/browser/chromeos/profiles/profile_helper.h" |
#include "chrome/browser/profiles/chrome_version_service.h" |
#include "chrome/browser/profiles/profile_impl.h" |
#include "chrome/browser/profiles/profile_manager.h" |
@@ -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) |
mtomasz
2015/02/18 03:13:06
Why is this change needed?
Ivan Podogov
2015/02/18 09:03:29
Because we force the sign-in profile to load, and
|
+ for (size_t idx = 0; idx != loaded_profiles.size(); ++idx) { |
mtomasz
2015/02/18 03:13:06
for (const auto& ... : ...)
Ivan Podogov
2015/02/24 11:43:16
Done.
|
+ if (!chromeos::ProfileHelper::IsSigninProfile(loaded_profiles[idx])) { |
+ profile = loaded_profiles[idx]; |
+ 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; |