| Index: chrome/browser/chromeos/login/signin/oauth2_browsertest.cc
|
| diff --git a/chrome/browser/chromeos/login/signin/oauth2_browsertest.cc b/chrome/browser/chromeos/login/signin/oauth2_browsertest.cc
|
| index edf53d94de2cd02222a1fdab6262827c4347c309..ce9cb0e853c7b794c4216276b936c5926023a773 100644
|
| --- a/chrome/browser/chromeos/login/signin/oauth2_browsertest.cc
|
| +++ b/chrome/browser/chromeos/login/signin/oauth2_browsertest.cc
|
| @@ -453,7 +453,8 @@ IN_PROC_BROWSER_TEST_F(OAuth2Test, PRE_MergeSession) {
|
| // MergeSession test is attempting to merge session for an existing profile
|
| // that was generated in PRE_PRE_MergeSession test. This attempt should fail
|
| // since FakeGaia instance isn't configured to return relevant tokens/cookies.
|
| -IN_PROC_BROWSER_TEST_F(OAuth2Test, MergeSession) {
|
| +// This test is flaky, see: crbug.com/408867.
|
| +IN_PROC_BROWSER_TEST_F(OAuth2Test, DISABLED_MergeSession) {
|
| SimulateNetworkOnline();
|
|
|
| content::WindowedNotificationObserver(
|
|
|