Fix copying of SAML IdP cookies on subsequent logins

chrome/browser/chromeos/login/profile_auth_data.cc

 // Copyright (c) 2012 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/chromeos/login/profile_auth_data.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 268 matching lines @@
 
 void ProfileAuthDataTransferer::MaybeTransferCookiesAndChannelIDs() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (waiting_for_auth_cookies_ || waiting_for_channel_ids_)
     return;
 
   net::CookieStore* to_store =
       to_context_->GetURLRequestContext()->cookie_store();
   net::CookieMonster* to_monster = to_store->GetCookieMonster();
   if (first_login_) {
-    to_monster->InitializeFrom(cookies_to_transfer_);
+    to_monster->ImportCookies(cookies_to_transfer_);
     net::ChannelIDService* to_cert_service =
         to_context_->GetURLRequestContext()->channel_id_service();
     to_cert_service->GetChannelIDStore()->InitializeFrom(
         channel_ids_to_transfer_);
   } else {
+    net::CookieList non_gaia_cookies;
     for (net::CookieList::const_iterator it = cookies_to_transfer_.begin();
          it != cookies_to_transfer_.end(); ++it) {
-      if (IsGAIACookie(*it))
-        continue;
-      // Although this method can be asynchronous, it will run synchronously in
-      // this case as the target cookie jar is guaranteed to be loaded and
-      // ready.
-      to_monster->SetCookieWithDetailsAsync(
-          GURL(it->Source()),
-          it->Name(),
-          it->Value(),
-          it->Domain(),
-          it->Path(),
-          it->ExpiryDate(),
-          it->IsSecure(),
-          it->IsHttpOnly(),
-          it->Priority(),
-          net::CookieStore::SetCookiesCallback());
+      if (!IsGAIACookie(*it))
+        non_gaia_cookies.push_back(*it);
     }
+    to_monster->ImportCookies(non_gaia_cookies);
   }
 
   Finish();
 }
 
 void ProfileAuthDataTransferer::Finish() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (!completion_callback_.is_null())
     BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, completion_callback_);
   base::MessageLoop::current()->DeleteSoon(FROM_HERE, this);
@@ skipping 10 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   (new ProfileAuthDataTransferer(
        from_context,
        to_context,
        transfer_auth_cookies_and_channel_ids_on_first_login,
        transfer_saml_auth_cookies_on_subsequent_login,
        completion_callback))->BeginTransfer();
 }
 
 }  // namespace chromeos