Revert 95825 - Update asynchronous CookieMonster API to login_utils.

BUG=68657
TEST=CookieMonsterTest.InitializeFromCookieMonster

Review URL: http://codereview.chromium.org/7541021

TBR=ycxiao@chromium.org
Review URL: http://codereview.chromium.org/7595007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95826 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/chromeos/login/login_utils.cc

@@ -129,17 +129,11 @@ class TransferDefaultCookiesOnIOThreadTask : public Task {
         auth_context_->GetURLRequestContext()->cookie_store();
     net::CookieMonster* default_monster = default_store->GetCookieMonster();
     default_monster->SetKeepExpiredCookies();
-    default_monster->GetAllCookiesAsync(base::Bind(&InitializeCookieMonster,
-                                                   base::Unretained(this)));
-  }
-
-  void InitializeCookieMonster(const net::CookieList& cookies) {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
     net::CookieStore* new_store =
         new_context_->GetURLRequestContext()->cookie_store();
     net::CookieMonster* new_monster = new_store->GetCookieMonster();
 
-    if (!new_monster->InitializeFrom(cookies)) {
+    if (!new_monster->InitializeFrom(default_monster)) {
       LOG(WARNING) << "Failed initial cookie transfer.";
     }
   }

net/base/cookie_monster.cc

@@ -611,7 +611,9 @@ void CookieMonster::SetCookieWithDetailsAsync(
     callback.Run(success_);
 }
 
-bool CookieMonster::InitializeFrom(const CookieList& list) {
+bool CookieMonster::InitializeFrom(CookieMonster* cookie_monster) {
+  net::CookieList list = cookie_monster->GetAllCookies();
+
   base::AutoLock autolock(lock_);
   InitIfNecessary();
   for (net::CookieList::const_iterator iter = list.begin();

net/base/cookie_monster.h

@@ -163,7 +163,7 @@ class NET_API CookieMonster : public CookieStore {
 
   // Helper function that adds all cookies from |cookie_monster| into this
   // instance.
-  bool InitializeFrom(const CookieList& list);
+  bool InitializeFrom(CookieMonster* cookie_monster);
 
   // Returns all the cookies, for use in management UI, etc. This does not mark
   // the cookies as having been accessed.

net/base/cookie_monster_unittest.cc

@@ -1707,25 +1707,24 @@ TEST_F(CookieMonsterTest, InitializeFromCookieMonster) {
                                                "A3=F;",
                                                options));
 
-  CookieList cookies_1 = GetAllCookies(cm_1);
   scoped_refptr<CookieMonster> cm_2(new CookieMonster(NULL, NULL));
-  ASSERT_TRUE(cm_2->InitializeFrom(cookies_1));
-  CookieList cookies_2 = GetAllCookies(cm_2);
+  ASSERT_TRUE(cm_2->InitializeFrom(cm_1.get()));
+  CookieList cookies = cm_2->GetAllCookies();
 
   size_t expected_size = 3;
-  EXPECT_EQ(expected_size, cookies_2.size());
+  EXPECT_EQ(expected_size, cookies.size());
 
-  CookieList::iterator it = cookies_2.begin();
+  CookieList::iterator it = cookies.begin();
 
-  ASSERT_TRUE(it != cookies_2.end());
+  ASSERT_TRUE(it != cookies.end());
   EXPECT_EQ("A1", it->Name());
   EXPECT_EQ("/foo", it->Path());
 
-  ASSERT_TRUE(++it != cookies_2.end());
+  ASSERT_TRUE(++it != cookies.end());
   EXPECT_EQ("A2", it->Name());
   EXPECT_EQ("/bar", it->Path());
 
-  ASSERT_TRUE(++it != cookies_2.end());
+  ASSERT_TRUE(++it != cookies.end());
   EXPECT_EQ("A3", it->Name());
   EXPECT_EQ("/", it->Path());
 }