Index: net/cookies/cookie_monster_perftest.cc |
diff --git a/net/cookies/cookie_monster_perftest.cc b/net/cookies/cookie_monster_perftest.cc |
index ff9513369bd3d91763385ae3177e0b2314adce32..1a4998195082bcc71b9f515ea909b88640b3fd36 100644 |
--- a/net/cookies/cookie_monster_perftest.cc |
+++ b/net/cookies/cookie_monster_perftest.cc |
@@ -98,6 +98,23 @@ class GetCookiesCallback : public BaseCallback { |
CookieOptions options_; |
}; |
+class GetAllCookiesCallback : public BaseCallback { |
mmenke
2017/07/12 18:29:04
While you're here...would you mind renaming BaseCa
Randy Smith (Not in Mondays)
2017/07/12 19:47:35
Done.
|
+ public: |
+ CookieList GetAllCookies(CookieMonster* cm) { |
+ cm->GetAllCookiesAsync( |
+ base::Bind(&GetAllCookiesCallback::Run, base::Unretained(this))); |
+ WaitForCallback(); |
+ return cookies_; |
+ } |
+ |
+ private: |
+ void Run(const CookieList& cookies) { |
+ cookies_ = cookies; |
+ BaseCallback::Run(); |
+ } |
+ CookieList cookies_; |
+}; |
+ |
} // namespace |
TEST(ParsedCookieTest, TestParseCookies) { |
@@ -227,7 +244,9 @@ TEST_F(CookieMonsterTest, TestDomainTree) { |
base::StringPrintf(domain_cookie_format_tree, it->c_str()); |
setCookieCallback.SetCookie(cm.get(), gurl, cookie); |
} |
- EXPECT_EQ(31u, cm->GetAllCookies().size()); |
+ |
+ GetAllCookiesCallback getAllCookiesCallback; |
+ EXPECT_EQ(31u, getAllCookiesCallback.GetAllCookies(cm.get()).size()); |
GURL probe_gurl("https://b.a.b.a.top.com/"); |
std::string cookie_line = getCookiesCallback.GetCookies(cm.get(), probe_gurl); |