1 files changed, 4 insertions, 38 deletions
diff --git a/net/cookies/cookie_monster_unittest.cc b/net/cookies/cookie_monster_unittest.cc
index 8be6923..1e8d83a 100644
--- a/net/cookies/cookie_monster_unittest.cc
+++ b/net/cookies/cookie_monster_unittest.cc
@@ -379,15 +379,6 @@ class MockGetCookiesCallback
   MOCK_METHOD1(Invoke, void(const std::string& cookies));
 };
 
-class MockGetCookieInfoCallback
-  : public MockCookieCallback<MockGetCookieInfoCallback,
-                              CookieStore::GetCookieInfoCallback> {
- public:
-  MOCK_METHOD2(Invoke,
-               void(const std::string& cookies,
-                    const std::vector<CookieStore::CookieInfo>& cookie_infos));
-};
-
 class MockSetCookiesCallback
   : public MockCookieCallback<MockSetCookiesCallback,
                               CookieStore::SetCookiesCallback> {
@@ -435,10 +426,6 @@ ACTION_P3(GetCookiesAction, cookie_monster, url, callback) {
   cookie_monster->GetCookiesWithOptionsAsync(
       url, CookieOptions(), callback->AsCallback());
 }
-ACTION_P3(GetCookiesWithInfoAction, cookie_monster, url, callback) {
-  cookie_monster->GetCookiesWithInfoAsync(
-      url, CookieOptions(), callback->AsCallback());
-}
 ACTION_P4(SetCookieAction, cookie_monster, url, cookie_line, callback) {
   cookie_monster->SetCookieWithOptionsAsync(
       url, cookie_line, CookieOptions(), callback->AsCallback());
@@ -620,27 +607,6 @@ TEST_F(DeferredCookieTaskTest, DeferredGetCookies) {
   CompleteLoadingAndWait();
 }
 
-TEST_F(DeferredCookieTaskTest, DeferredGetCookiesWithInfo) {
-  DeclareLoadedCookie("www.google.izzle",
-                      "X=1; path=/; expires=Mon, 18-Apr-22 22:50:14 GMT",
-                      Time::Now() + TimeDelta::FromDays(3));
-
-  MockGetCookieInfoCallback get_cookie_info_callback;
-
-  BeginWithForDomainKey("google.izzle", GetCookiesWithInfoAction(
-      &cookie_monster(), url_google_, &get_cookie_info_callback));
-
-  WaitForLoadCall();
-
-  EXPECT_CALL(get_cookie_info_callback, Invoke("X=1", testing::_)).WillOnce(
-      GetCookiesWithInfoAction(
-          &cookie_monster(), url_google_, &get_cookie_info_callback));
-  EXPECT_CALL(get_cookie_info_callback, Invoke("X=1", testing::_)).WillOnce(
-      QuitCurrentMessageLoop());
-
-  CompleteLoadingAndWait();
-}
-
 TEST_F(DeferredCookieTaskTest, DeferredSetCookie) {
   MockSetCookiesCallback set_cookies_callback;
 
@@ -855,7 +821,7 @@ TEST_F(DeferredCookieTaskTest, DeferredTaskOrder) {
   MockGetCookiesCallback get_cookies_callback;
   MockSetCookiesCallback set_cookies_callback;
   MockClosure delete_cookie_callback;
-  MockGetCookieInfoCallback get_cookie_info_callback;
+  MockGetCookiesCallback get_cookies_callback_deferred;
 
   EXPECT_CALL(*this, Begin()).WillOnce(testing::DoAll(
       GetCookiesAction(
@@ -870,9 +836,9 @@ TEST_F(DeferredCookieTaskTest, DeferredTaskOrder) {
 
   WaitForLoadCall();
   EXPECT_CALL(get_cookies_callback, Invoke("X=1")).WillOnce(
-      GetCookiesWithInfoAction(
-          &cookie_monster(), url_google_, &get_cookie_info_callback));
-  EXPECT_CALL(get_cookie_info_callback, Invoke("X=1", testing::_)).WillOnce(
+      GetCookiesAction(
+          &cookie_monster(), url_google_, &get_cookies_callback_deferred));
+  EXPECT_CALL(get_cookies_callback_deferred, Invoke("X=1")).WillOnce(
       QuitCurrentMessageLoop());
   EXPECT_CALL(set_cookies_callback, Invoke(true));
   EXPECT_CALL(delete_cookie_callback, Invoke());