Update asynchronous CookieMonster API to login_utils.

chrome/browser/chromeos/login/login_utils.cc

 // Copyright (c) 2011 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/login_utils.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
@@ skipping 105 matching lines @@
       net::URLRequestContextGetter* auth_context, Profile* new_profile,
       net::URLRequestContextGetter* new_context)
           : auth_context_(auth_context),
             new_profile_(new_profile),
             new_context_(new_context) {}
   virtual ~TransferDefaultCookiesOnIOThreadTask() {}
 
   // Task override.
   virtual void Run() {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-    net::CookieStore* default_store =
-        auth_context_->GetURLRequestContext()->cookie_store();
-    net::CookieMonster* default_monster = default_store->GetCookieMonster();
-    default_monster->SetKeepExpiredCookies();
     net::CookieStore* new_store =
         new_context_->GetURLRequestContext()->cookie_store();
     net::CookieMonster* new_monster = new_store->GetCookieMonster();
 
+    new_monster->GetAllCookiesAsync(base::Bind(&HasCookie,
+                                               base::Unretained(this)));
+  }
+
+  void HasCookie(const net::CookieList& existing_cookies) {

[zel, 2011/08/03 21:44:04]

the code changed here, we don't fetch two cookie lists anymore, please sync and
update your CL

     // Check that existing store does not already have some cookies.
     // If it does, we are probably dealing with previously created profile
     // and no transfer will be necessary.
     // TOOD(zelidrag): Investigate perf impact of the next operation
     // in case when we have a profile with bunch of cookies.
-    net::CookieList existing_cookies = new_monster->GetAllCookies();
     if (existing_cookies.size())
       return;
 
-    if (!new_monster->InitializeFrom(default_monster)) {
+    net::CookieStore* default_store =
+        auth_context_->GetURLRequestContext()->cookie_store();
+    net::CookieMonster* default_monster = default_store->GetCookieMonster();
+    default_monster->GetAllCookiesAsync(base::Bind(&InitializeCookieMonster,
+                                                   base::Unretained(this)));
+  }
+
+  void InitializeCookieMonster(const net::CookieList& cookies) {
+    net::CookieStore* new_store =
+        new_context_->GetURLRequestContext()->cookie_store();
+    net::CookieMonster* new_monster = new_store->GetCookieMonster();
+
+    if (!new_monster->InitializeFrom(cookies)) {
       LOG(WARNING) << "Failed initial cookie transfer.";
     }
 
     // TODO(zelidrag): Once sync is OAuth happy, remove this part.
     GaiaAuthConsumer::ClientLoginResult credentials;
-    GetCredentialsFromCookieJar(default_monster->GetAllCookies(), &credentials);
+    GetCredentialsFromCookieJar(cookies, &credentials);
     BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
                             new FetchTokensOnUIThreadTask(
                                 new_profile_,
                                 credentials));
   }
 
   // TODO(zelidrag): Once sync is OAuth happy, remove this function.
   void GetCredentialsFromCookieJar(const net::CookieList& cookies,
       GaiaAuthConsumer::ClientLoginResult* credentials) {
     // At this point we should only have GAIA's cookies in place,
@@ skipping 670 matching lines @@
   // Mark login host for deletion after browser starts.  This
   // guarantees that the message loop will be referenced by the
   // browser before it is dereferenced by the login host.
   if (login_host) {
     login_host->OnSessionStart();
     login_host = NULL;
   }
 }
 
 }  // namespace chromeos