Expose ReconcilorState. Rename MergeSession in Signin Tracker.

chrome/browser/signin/fake_gaia_cookie_manager_service.cc

 // 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 "chrome/browser/signin/fake_gaia_cookie_manager_service.h"
 
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/chrome_signin_client_factory.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
@@ skipping 16 matching lines @@
 void FakeGaiaCookieManagerService::SetListAccountsResponseHttpNotFound() {
   DCHECK(url_fetcher_factory_);
   url_fetcher_factory_->SetFakeResponse(
       GaiaUrls::GetInstance()->ListAccountsURLWithSource(
           GaiaConstants::kChromeSource),
       "",
       net::HTTP_NOT_FOUND,
       net::URLRequestStatus::SUCCESS);
 }
 
+void FakeGaiaCookieManagerService::SetListAccountsResponseWebLoginRequired() {
+  DCHECK(url_fetcher_factory_);
+  url_fetcher_factory_->SetFakeResponse(
+      GaiaUrls::GetInstance()->ListAccountsURLWithSource(
+          GaiaConstants::kChromeSource),
+      "Info=WebLoginRequired",
+      net::HTTP_OK,
+      net::URLRequestStatus::SUCCESS);
+}
+
 void FakeGaiaCookieManagerService::SetListAccountsResponseNoAccounts() {
   DCHECK(url_fetcher_factory_);
   url_fetcher_factory_->SetFakeResponse(
       GaiaUrls::GetInstance()->ListAccountsURLWithSource(
           GaiaConstants::kChromeSource),
       "[\"f\", []]",
       net::HTTP_OK,
       net::URLRequestStatus::SUCCESS);
 }
 
@@ skipping 56 matching lines @@
 // static
 KeyedService* FakeGaiaCookieManagerService::Build(
     content::BrowserContext* context) {
   Profile* profile = Profile::FromBrowserContext(context);
   FakeGaiaCookieManagerService* service = new FakeGaiaCookieManagerService(
       ProfileOAuth2TokenServiceFactory::GetForProfile(profile),
       GaiaConstants::kChromeSource,
       ChromeSigninClientFactory::GetForProfile(profile));
   return service;
 }