Merge 182833

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 "chrome/browser/profiles/profile.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/server_bound_cert_service.h"
 #include "net/base/server_bound_cert_store.h"
@@ skipping 140 matching lines @@
   Finish();
 }
 
 // Callback for receiving |cookies_to_transfer| from the authentication profile
 // cookie jar.
 void ProfileAuthDataTransferer::OnGetCookiesToTransfer(
     const net::CookieList& cookies_to_transfer) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   got_cookies_ = true;
+  cookies_to_transfer_ = cookies_to_transfer;
   MaybeDoCookieAndCertTransfer();
 }
 
 // Retrieves initial set of Profile cookies from the |from_context_|.
 void ProfileAuthDataTransferer::RetrieveDefaultCookies() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   net::CookieStore* from_store =
       from_context_->GetURLRequestContext()->cookie_store();
   net::CookieMonster* from_monster = from_store->GetCookieMonster();
@@ skipping 42 matching lines @@
     Profile* from_profile,
     Profile* to_profile,
     bool transfer_cookies,
     const base::Closure& completion_callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   (new ProfileAuthDataTransferer(from_profile, to_profile, transfer_cookies,
                                  completion_callback))->BeginTransfer();
 }
 
 }  // namespace chromeos