When the user signs in, make sure to set cookies on all reachable google

google_apis/gaia/gaia_auth_fetcher_unittest.cc

Index: google_apis/gaia/gaia_auth_fetcher_unittest.cc
diff --git a/google_apis/gaia/gaia_auth_fetcher_unittest.cc b/google_apis/gaia/gaia_auth_fetcher_unittest.cc
index 75a8db73afe9e010bfd4d6a4e086e7379b681633..971d47d319798294e0a8d16c392eba1d47429cec 100644
--- a/google_apis/gaia/gaia_auth_fetcher_unittest.cc
+++ b/google_apis/gaia/gaia_auth_fetcher_unittest.cc
@@ -188,6 +188,7 @@ class MockGaiaConsumer : public GaiaAuthConsumer {
   MOCK_METHOD1(OnUberAuthTokenFailure, void(
       const GoogleServiceAuthError& error));
   MOCK_METHOD1(OnListAccountsSuccess, void(const std::string& data));
+  MOCK_METHOD1(OnGetCheckConnectionInfoSuccess, void(const std::string& data));
 };
 
 #if defined(OS_WIN)
@@ -655,7 +656,7 @@ TEST_F(GaiaAuthFetcherTest, MergeSessionSuccess) {
   net::TestURLFetcherFactory factory;
 
   GaiaAuthFetcher auth(&consumer, std::string(), GetRequestContext());
-  auth.StartMergeSession("myubertoken");
+  auth.StartMergeSession("myubertoken", std::string());
 
   EXPECT_TRUE(auth.HasPendingFetch());
   MockFetcher mock_fetcher(
@@ -675,7 +676,7 @@ TEST_F(GaiaAuthFetcherTest, MergeSessionSuccessRedirect) {
   net::TestURLFetcherFactory factory;
 
   GaiaAuthFetcher auth(&consumer, std::string(), GetRequestContext());
-  auth.StartMergeSession("myubertoken");
+  auth.StartMergeSession("myubertoken", std::string());
 
   // Make sure the fetcher created has the expected flags.  Set its url()
   // properties to reflect a redirect.
@@ -791,3 +792,17 @@ TEST_F(GaiaAuthFetcherTest, ListAccounts) {
       status, net::HTTP_OK, cookies_, data, net::URLFetcher::GET, &auth);
   auth.OnURLFetchComplete(&mock_fetcher);
 }
+
+TEST_F(GaiaAuthFetcherTest, GetCheckConnectionInfo) {
+  std::string data(
+      "[{\"carryBackToken\": \"token1\", \"url\": \"http://www.google.com\"}]");
+  MockGaiaConsumer consumer;
+  EXPECT_CALL(consumer, OnGetCheckConnectionInfoSuccess(data)).Times(1);
+
+  GaiaAuthFetcher auth(&consumer, std::string(), GetRequestContext());
+  net::URLRequestStatus status(net::URLRequestStatus::SUCCESS, 0);
+  MockFetcher mock_fetcher(
+      GaiaUrls::GetInstance()->get_check_connection_info_url(),
+      status, net::HTTP_OK, cookies_, data, net::URLFetcher::GET, &auth);
+  auth.OnURLFetchComplete(&mock_fetcher);
+}