Revert 95825 - Update asynchronous CookieMonster API to login_utils.

net/base/cookie_monster_unittest.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 <time.h>
 
 #include <algorithm>
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 1689 matching lines @@
   EXPECT_TRUE(SetCookieWithOptions(cm_1.get(), url_google_foo_,
                                                "A1=B; path=/foo;",
                                                options));
   EXPECT_TRUE(SetCookieWithOptions(cm_1.get(), url_google_bar_,
                                                "A2=D; path=/bar;",
                                                options));
   EXPECT_TRUE(SetCookieWithOptions(cm_1.get(), url_google_,
                                                "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());
 }
 
 
 // Test that overwriting persistent cookies deletes the old one from the
 // backing store.
 TEST_F(CookieMonsterTest, OverwritePersistentCookie) {
   GURL url_google("http://www.google.com/");
   GURL url_chromium("http://chromium.org");
@@ skipping 1278 matching lines @@
   base::Closure task = base::Bind(
       &net::MultiThreadedCookieMonsterTest::DeleteCanonicalCookieTask,
       base::Unretained(this),
       cm, *it, &callback);
   RunOnOtherThread(task);
   EXPECT_TRUE(callback.did_run());
   EXPECT_TRUE(callback.result());
 }
 
 }  // namespace net