Force Account Consistency off for Logout call on iOS.

ios/chrome/browser/signin/gaia_auth_fetcher_ios.mm

 // Copyright 2015 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 "ios/chrome/browser/signin/gaia_auth_fetcher_ios.h"
 
 #import <WebKit/WebKit.h>
 
 #include "base/json/string_escape.h"
 #include "base/logging.h"
@@ skipping 302 matching lines @@
 }
 
 #pragma mark - GaiaAuthFetcherIOS definition
 
 GaiaAuthFetcherIOS::GaiaAuthFetcherIOS(GaiaAuthConsumer* consumer,
                                        const std::string& source,
                                        net::URLRequestContextGetter* getter,
                                        web::BrowserState* browser_state)
     : GaiaAuthFetcher(consumer, source, getter),
       bridge_(new GaiaAuthFetcherIOSBridge(this, browser_state)),
-      browser_state_(browser_state) {}
+      browser_state_(browser_state) {
+  // Account Consistency needs to be disabled for the Logout call. There is a
+  // race with the cookie clearing request (handled by
+  // AccountConsistencyService), so we invalidate the cookie for the call.
+  SetLogoutHeaders("Cookie: X-CHROME-CONNECTED=EXPIRED;");
+}
 
 GaiaAuthFetcherIOS::~GaiaAuthFetcherIOS() {
 }
 
 void GaiaAuthFetcherIOS::CreateAndStartGaiaFetcher(const std::string& body,
                                                    const std::string& headers,
                                                    const GURL& gaia_gurl,
                                                    int load_flags) {
   DCHECK(!HasPendingFetch()) << "Tried to fetch two things at once!";
 
@@ skipping 37 matching lines @@
 
 void GaiaAuthFetcherIOS::SetShouldUseGaiaAuthFetcherIOSForTesting(
     bool use_gaia_fetcher_ios) {
   g_should_use_gaia_auth_fetcher_ios = use_gaia_fetcher_ios;
 }
 
 bool GaiaAuthFetcherIOS::ShouldUseGaiaAuthFetcherIOS() {
   return experimental_flags::IsWKWebViewEnabled() &&
          g_should_use_gaia_auth_fetcher_ios;
 }