Disable OAuth2Test.MergeSession

chrome/browser/chromeos/login/signin/oauth2_browsertest.cc

 // Copyright 2014 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 <string>
 
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/stringprintf.h"
 #include "base/synchronization/waitable_event.h"
@@ skipping 435 matching lines @@
   // These should be cookie values that we generated by calling /MergeSession,
   // since /ListAccounts should have tell us that the initial session cookies
   // are stale.
   EXPECT_EQ(cookie_reader->GetCookieValue("SID"), kTestSession2SIDCookie);
   EXPECT_EQ(cookie_reader->GetCookieValue("LSID"), kTestSession2LSIDCookie);
 }
 
 // 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(
     chrome::NOTIFICATION_LOGIN_OR_LOCK_WEBUI_VISIBLE,
     content::NotificationService::AllSources()).Wait();
 
   JsExpect("!!document.querySelector('#account-picker')");
   JsExpect("!!document.querySelector('#pod-row')");
 
   EXPECT_EQ(GetOAuthStatusFromLocalState(kTestAccountId),
@@ skipping 313 matching lines @@
 
   if (!catcher.GetNextResult()) {
     std::string message = catcher.message();
     ADD_FAILURE() << "Tests failed: " << message;
   }
 
   EXPECT_TRUE(fake_google_.IsPageRequested());
 }
 
 }  // namespace chromeos