Chromium Code Reviews| Index: net/cookies/cookie_monster_unittest.cc |
| diff --git a/net/cookies/cookie_monster_unittest.cc b/net/cookies/cookie_monster_unittest.cc |
| index c42b5471325723de56757aaca4c2ec6d724a5cda..a837aa6e1f0dd7e58ee9aa0dc6d8db00f85465e1 100644 |
| --- a/net/cookies/cookie_monster_unittest.cc |
| +++ b/net/cookies/cookie_monster_unittest.cc |
| @@ -115,7 +115,6 @@ INSTANTIATE_TYPED_TEST_CASE_P(CookieMonsterStrictSecure, |
| template <typename T> |
| class CookieMonsterTestBase : public CookieStoreTest<T> { |
| public: |
| - using CookieStoreTest<T>::RunFor; |
| using CookieStoreTest<T>::SetCookie; |
| protected: |
| @@ -127,7 +126,7 @@ class CookieMonsterTestBase : public CookieStoreTest<T> { |
| GetCookieListCallback callback; |
| cm->GetAllCookiesForURLAsync(url, base::Bind(&GetCookieListCallback::Run, |
| base::Unretained(&callback))); |
| - RunFor(kTimeout); |
| + callback.WaitUntilDone(); |
| EXPECT_TRUE(callback.did_run()); |
| return callback.cookies(); |
| } |
| @@ -140,7 +139,7 @@ class CookieMonsterTestBase : public CookieStoreTest<T> { |
| cm->GetAllCookiesForURLWithOptionsAsync( |
| url, options, |
| base::Bind(&GetCookieListCallback::Run, base::Unretained(&callback))); |
| - RunFor(kTimeout); |
| + callback.WaitUntilDone(); |
| EXPECT_TRUE(callback.did_run()); |
| return callback.cookies(); |
| } |
| @@ -164,7 +163,7 @@ class CookieMonsterTestBase : public CookieStoreTest<T> { |
| false /* enforces strict secure cookies */, priority, |
| base::Bind(&ResultSavingCookieCallback<bool>::Run, |
| base::Unretained(&callback))); |
| - RunFor(kTimeout); |
| + callback.WaitUntilDone(); |
| EXPECT_TRUE(callback.did_run()); |
| return callback.result(); |
| } |
| @@ -175,7 +174,7 @@ class CookieMonsterTestBase : public CookieStoreTest<T> { |
| cm->SetAllCookiesAsync(list, |
| base::Bind(&ResultSavingCookieCallback<bool>::Run, |
| base::Unretained(&callback))); |
| - RunFor(kTimeout); |
| + callback.WaitUntilDone(); |
| EXPECT_TRUE(callback.did_run()); |
| return callback.result(); |
| } |
| @@ -185,7 +184,7 @@ class CookieMonsterTestBase : public CookieStoreTest<T> { |
| ResultSavingCookieCallback<int> callback; |
| cm->DeleteAllAsync(base::Bind(&ResultSavingCookieCallback<int>::Run, |
| base::Unretained(&callback))); |
| - RunFor(kTimeout); |
| + callback.WaitUntilDone(); |
| EXPECT_TRUE(callback.did_run()); |
| return callback.result(); |
| } |
| @@ -199,7 +198,7 @@ class CookieMonsterTestBase : public CookieStoreTest<T> { |
| delete_begin, delete_end, |
| base::Bind(&ResultSavingCookieCallback<int>::Run, |
| base::Unretained(&callback))); |
| - RunFor(kTimeout); |
| + callback.WaitUntilDone(); |
| EXPECT_TRUE(callback.did_run()); |
| return callback.result(); |
| } |
| @@ -214,7 +213,7 @@ class CookieMonsterTestBase : public CookieStoreTest<T> { |
| delete_begin, delete_end, url, |
| base::Bind(&ResultSavingCookieCallback<int>::Run, |
| base::Unretained(&callback))); |
| - RunFor(kTimeout); |
| + callback.WaitUntilDone(); |
| EXPECT_TRUE(callback.did_run()); |
| return callback.result(); |
| } |
| @@ -225,7 +224,7 @@ class CookieMonsterTestBase : public CookieStoreTest<T> { |
| cm->DeleteAllForHostAsync(url, |
| base::Bind(&ResultSavingCookieCallback<int>::Run, |
| base::Unretained(&callback))); |
| - RunFor(kTimeout); |
| + callback.WaitUntilDone(); |
| EXPECT_TRUE(callback.did_run()); |
| return callback.result(); |
| } |
| @@ -236,7 +235,7 @@ class CookieMonsterTestBase : public CookieStoreTest<T> { |
| cm->DeleteCanonicalCookieAsync( |
| cookie, base::Bind(&ResultSavingCookieCallback<bool>::Run, |
| base::Unretained(&callback))); |
| - RunFor(kTimeout); |
| + callback.WaitUntilDone(); |
| EXPECT_TRUE(callback.did_run()); |
| return callback.result(); |
| } |
| @@ -705,9 +704,8 @@ struct CookiesInputInfo { |
| CookiePriority priority; |
| }; |
| -ACTION(QuitCurrentMessageLoop) { |
| - base::ThreadTaskRunnerHandle::Get()->PostTask( |
| - FROM_HERE, base::MessageLoop::QuitWhenIdleClosure()); |
| +ACTION_P(QuitRunLoop, run_loop) { |
| + run_loop->Quit(); |
| } |
| // TODO(erikwright): When the synchronous helpers 'GetCookies' etc. are removed, |
| @@ -786,7 +784,7 @@ ACTION_P2(DeleteSessionCookiesAction, cookie_monster, callback) { |
| // 3. Invocations after the loading has completed complete immediately. |
| class DeferredCookieTaskTest : public CookieMonsterTest { |
| protected: |
| - DeferredCookieTaskTest() { |
| + DeferredCookieTaskTest() : load_run_loop_(new base::RunLoop) { |
| persistent_store_ = new NewMockPersistentCookieStore(); |
| cookie_monster_ = new CookieMonster(persistent_store_.get(), NULL); |
| } |
| @@ -799,26 +797,23 @@ class DeferredCookieTaskTest : public CookieMonsterTest { |
| } |
| // Runs the message loop, waiting until PersistentCookieStore::Load is called. |
| - // Call CompleteLoadingAndWait to cause the load to complete. |
| + // Call CompleteLoading to cause the load to complete. |
| void WaitForLoadCall() { |
| - RunFor(kTimeout); |
| + load_run_loop_->Run(); |
| // Verify that PeristentStore::Load was called. |
| testing::Mock::VerifyAndClear(persistent_store_.get()); |
| } |
| // Invokes the PersistentCookieStore::LoadCookiesForKey completion callbacks |
| - // and PersistentCookieStore::Load completion callback and waits |
| - // until the message loop is quit. |
| - void CompleteLoadingAndWait() { |
| + // and PersistentCookieStore::Load completion callback. |
| + void CompleteLoading() { |
| while (!loaded_for_key_callbacks_.empty()) { |
| loaded_for_key_callbacks_.front().Run(loaded_cookies_); |
| loaded_cookies_.clear(); |
| loaded_for_key_callbacks_.pop(); |
| } |
| - |
| loaded_callback_.Run(loaded_cookies_); |
| - RunFor(kTimeout); |
| } |
| // Performs the provided action, expecting it to cause a call to |
| @@ -834,7 +829,7 @@ class DeferredCookieTaskTest : public CookieMonsterTest { |
| testing::Action<void(void)> action) { |
| EXPECT_CALL(*this, Begin()).WillOnce(action); |
| ExpectLoadCall(); |
| - ExpectLoadForKeyCall(key, false); |
| + ExpectLoadForKeyCall(key); |
| Begin(); |
| } |
| @@ -843,21 +838,14 @@ class DeferredCookieTaskTest : public CookieMonsterTest { |
| void ExpectLoadCall() { |
|
mmenke
2016/01/27 16:55:42
Maybe add some sort of CHECK to make sure this is
xunjieli
2016/01/27 18:35:02
Done. Added a boolean, not sure if there's a clean
|
| EXPECT_CALL(*persistent_store_.get(), Load(testing::_)) |
| .WillOnce(testing::DoAll(testing::SaveArg<0>(&loaded_callback_), |
| - QuitCurrentMessageLoop())); |
| + QuitRunLoop(load_run_loop_.get()))); |
| } |
| // Declares an expectation that PersistentCookieStore::LoadCookiesForKey |
| - // will be called, saving the provided callback and sending a quit to the |
| - // message loop. |
| - void ExpectLoadForKeyCall(const std::string& key, bool quit_queue) { |
| - if (quit_queue) |
| - EXPECT_CALL(*persistent_store_.get(), LoadCookiesForKey(key, testing::_)) |
| - .WillOnce( |
| - testing::DoAll(PushCallbackAction(&loaded_for_key_callbacks_), |
| - QuitCurrentMessageLoop())); |
| - else |
| - EXPECT_CALL(*persistent_store_.get(), LoadCookiesForKey(key, testing::_)) |
| - .WillOnce(PushCallbackAction(&loaded_for_key_callbacks_)); |
| + // will be called, saving the provided callback. |
| + void ExpectLoadForKeyCall(const std::string& key) { |
|
mmenke
2016/01/27 16:55:42
This was never being called with true, right?
xunjieli
2016/01/27 18:35:01
It was never being called with true.
|
| + EXPECT_CALL(*persistent_store_.get(), LoadCookiesForKey(key, testing::_)) |
| + .WillOnce(PushCallbackAction(&loaded_for_key_callbacks_)); |
| } |
| // Invokes the initial action. |
| @@ -879,7 +867,8 @@ class DeferredCookieTaskTest : public CookieMonsterTest { |
| // PersistentCookieStore::LoadCookiesForKey |
| std::queue<CookieMonster::PersistentCookieStore::LoadedCallback> |
| loaded_for_key_callbacks_; |
| - |
| + // base::RunLoop used to wait for PersistentCookieStore::Load to be called. |
| + scoped_ptr<base::RunLoop> load_run_loop_; |
|
mmenke
2016/01/27 16:55:42
No need to use a scoped_ptr
xunjieli
2016/01/27 18:35:02
Done.
|
| // Stores the CookieMonster under test. |
| scoped_refptr<CookieMonster> cookie_monster_; |
| // Stores the mock PersistentCookieStore. |
| @@ -903,10 +892,12 @@ TEST_F(DeferredCookieTaskTest, DeferredGetCookies) { |
| EXPECT_CALL(get_cookies_callback, Invoke("X=1")) |
| .WillOnce(GetCookiesAction(&cookie_monster(), http_www_google_.url(), |
| &get_cookies_callback)); |
| + scoped_ptr<base::RunLoop> loop(new base::RunLoop); |
|
mmenke
2016/01/27 16:55:42
None of these need to use scoped_ptrs.
xunjieli
2016/01/27 18:35:02
Done.
|
| EXPECT_CALL(get_cookies_callback, Invoke("X=1")) |
| - .WillOnce(QuitCurrentMessageLoop()); |
| + .WillOnce(QuitRunLoop(loop.get())); |
| - CompleteLoadingAndWait(); |
| + CompleteLoading(); |
| + loop->Run(); |
| } |
| TEST_F(DeferredCookieTaskTest, DeferredSetCookie) { |
| @@ -922,10 +913,12 @@ TEST_F(DeferredCookieTaskTest, DeferredSetCookie) { |
| EXPECT_CALL(set_cookies_callback, Invoke(true)) |
| .WillOnce(SetCookieAction(&cookie_monster(), http_www_google_.url(), |
| "X=Y", &set_cookies_callback)); |
| + scoped_ptr<base::RunLoop> loop(new base::RunLoop); |
| EXPECT_CALL(set_cookies_callback, Invoke(true)) |
| - .WillOnce(QuitCurrentMessageLoop()); |
| + .WillOnce(QuitRunLoop(loop.get())); |
| - CompleteLoadingAndWait(); |
| + CompleteLoading(); |
| + loop->Run(); |
| } |
| TEST_F(DeferredCookieTaskTest, DeferredSetAllCookies) { |
| @@ -948,10 +941,12 @@ TEST_F(DeferredCookieTaskTest, DeferredSetAllCookies) { |
| EXPECT_CALL(set_cookies_callback, Invoke(true)) |
| .WillOnce( |
| SetAllCookiesAction(&cookie_monster(), list, &set_cookies_callback)); |
| + scoped_ptr<base::RunLoop> loop(new base::RunLoop); |
| EXPECT_CALL(set_cookies_callback, Invoke(true)) |
| - .WillOnce(QuitCurrentMessageLoop()); |
| + .WillOnce(QuitRunLoop(loop.get())); |
| - CompleteLoadingAndWait(); |
| + CompleteLoading(); |
| + loop->Run(); |
| } |
| TEST_F(DeferredCookieTaskTest, DeferredDeleteCookie) { |
| @@ -967,10 +962,12 @@ TEST_F(DeferredCookieTaskTest, DeferredDeleteCookie) { |
| EXPECT_CALL(delete_cookie_callback, Invoke()) |
| .WillOnce(DeleteCookieAction(&cookie_monster(), http_www_google_.url(), |
| "X", &delete_cookie_callback)); |
| + scoped_ptr<base::RunLoop> loop(new base::RunLoop); |
| EXPECT_CALL(delete_cookie_callback, Invoke()) |
| - .WillOnce(QuitCurrentMessageLoop()); |
| + .WillOnce(QuitRunLoop(loop.get())); |
| - CompleteLoadingAndWait(); |
| + CompleteLoading(); |
| + loop->Run(); |
| } |
| TEST_F(DeferredCookieTaskTest, DeferredSetCookieWithDetails) { |
| @@ -1006,10 +1003,12 @@ TEST_F(DeferredCookieTaskTest, DeferredSetCookieWithDetails) { |
| EXPECT_CALL(set_cookies_callback, Invoke(true)) |
| .WillOnce(SetCookieWithDetailsAction(&cookie_monster(), cookie_info_exp, |
| &set_cookies_callback)); |
| + scoped_ptr<base::RunLoop> loop(new base::RunLoop); |
| EXPECT_CALL(set_cookies_callback, Invoke(true)) |
| - .WillOnce(QuitCurrentMessageLoop()); |
| + .WillOnce(QuitRunLoop(loop.get())); |
| - CompleteLoadingAndWait(); |
| + CompleteLoading(); |
| + loop->Run(); |
| } |
| TEST_F(DeferredCookieTaskTest, DeferredGetAllCookies) { |
| @@ -1026,10 +1025,12 @@ TEST_F(DeferredCookieTaskTest, DeferredGetAllCookies) { |
| EXPECT_CALL(get_cookie_list_callback, Invoke(testing::_)) |
| .WillOnce( |
| GetAllCookiesAction(&cookie_monster(), &get_cookie_list_callback)); |
| + scoped_ptr<base::RunLoop> loop(new base::RunLoop); |
| EXPECT_CALL(get_cookie_list_callback, Invoke(testing::_)) |
| - .WillOnce(QuitCurrentMessageLoop()); |
| + .WillOnce(QuitRunLoop(loop.get())); |
| - CompleteLoadingAndWait(); |
| + CompleteLoading(); |
| + loop->Run(); |
| } |
| TEST_F(DeferredCookieTaskTest, DeferredGetAllForUrlCookies) { |
| @@ -1050,10 +1051,12 @@ TEST_F(DeferredCookieTaskTest, DeferredGetAllForUrlCookies) { |
| .WillOnce(GetAllCookiesForUrlAction(&cookie_monster(), |
| http_www_google_.url(), |
| &get_cookie_list_callback)); |
| + scoped_ptr<base::RunLoop> loop(new base::RunLoop); |
| EXPECT_CALL(get_cookie_list_callback, Invoke(testing::_)) |
| - .WillOnce(QuitCurrentMessageLoop()); |
| + .WillOnce(QuitRunLoop(loop.get())); |
| - CompleteLoadingAndWait(); |
| + CompleteLoading(); |
| + loop->Run(); |
| } |
| TEST_F(DeferredCookieTaskTest, DeferredGetAllForUrlWithOptionsCookies) { |
| @@ -1074,10 +1077,12 @@ TEST_F(DeferredCookieTaskTest, DeferredGetAllForUrlWithOptionsCookies) { |
| .WillOnce(GetAllCookiesForUrlWithOptionsAction( |
| &cookie_monster(), http_www_google_.url(), |
| &get_cookie_list_callback)); |
| + scoped_ptr<base::RunLoop> loop(new base::RunLoop); |
| EXPECT_CALL(get_cookie_list_callback, Invoke(testing::_)) |
| - .WillOnce(QuitCurrentMessageLoop()); |
| + .WillOnce(QuitRunLoop(loop.get())); |
| - CompleteLoadingAndWait(); |
| + CompleteLoading(); |
| + loop->Run(); |
| } |
| TEST_F(DeferredCookieTaskTest, DeferredDeleteAllCookies) { |
| @@ -1089,10 +1094,12 @@ TEST_F(DeferredCookieTaskTest, DeferredDeleteAllCookies) { |
| EXPECT_CALL(delete_callback, Invoke(false)) |
| .WillOnce(DeleteAllAction(&cookie_monster(), &delete_callback)); |
| - EXPECT_CALL(delete_callback, Invoke(false)) |
| - .WillOnce(QuitCurrentMessageLoop()); |
| - CompleteLoadingAndWait(); |
| + scoped_ptr<base::RunLoop> loop(new base::RunLoop); |
| + EXPECT_CALL(delete_callback, Invoke(false)).WillOnce(QuitRunLoop(loop.get())); |
| + |
| + CompleteLoading(); |
| + loop->Run(); |
| } |
| TEST_F(DeferredCookieTaskTest, DeferredDeleteAllCreatedBetweenCookies) { |
| @@ -1107,10 +1114,11 @@ TEST_F(DeferredCookieTaskTest, DeferredDeleteAllCreatedBetweenCookies) { |
| .WillOnce(DeleteAllCreatedBetweenAction(&cookie_monster(), base::Time(), |
| base::Time::Now(), |
| &delete_callback)); |
| - EXPECT_CALL(delete_callback, Invoke(false)) |
| - .WillOnce(QuitCurrentMessageLoop()); |
| + scoped_ptr<base::RunLoop> loop(new base::RunLoop); |
| + EXPECT_CALL(delete_callback, Invoke(false)).WillOnce(QuitRunLoop(loop.get())); |
| - CompleteLoadingAndWait(); |
| + CompleteLoading(); |
| + loop->Run(); |
| } |
| TEST_F(DeferredCookieTaskTest, DeferredDeleteAllForHostCookies) { |
| @@ -1126,10 +1134,11 @@ TEST_F(DeferredCookieTaskTest, DeferredDeleteAllForHostCookies) { |
| EXPECT_CALL(delete_callback, Invoke(false)) |
| .WillOnce(DeleteAllForHostAction( |
| &cookie_monster(), http_www_google_.url(), &delete_callback)); |
| - EXPECT_CALL(delete_callback, Invoke(false)) |
| - .WillOnce(QuitCurrentMessageLoop()); |
| + scoped_ptr<base::RunLoop> loop(new base::RunLoop); |
| + EXPECT_CALL(delete_callback, Invoke(false)).WillOnce(QuitRunLoop(loop.get())); |
| - CompleteLoadingAndWait(); |
| + CompleteLoading(); |
| + loop->Run(); |
| } |
| TEST_F(DeferredCookieTaskTest, DeferredDeleteCanonicalCookie) { |
| @@ -1147,10 +1156,12 @@ TEST_F(DeferredCookieTaskTest, DeferredDeleteCanonicalCookie) { |
| EXPECT_CALL(delete_cookie_callback, Invoke(false)) |
| .WillOnce(DeleteCanonicalCookieAction(&cookie_monster(), cookie, |
| &delete_cookie_callback)); |
| + scoped_ptr<base::RunLoop> loop(new base::RunLoop); |
| EXPECT_CALL(delete_cookie_callback, Invoke(false)) |
| - .WillOnce(QuitCurrentMessageLoop()); |
| + .WillOnce(QuitRunLoop(loop.get())); |
| - CompleteLoadingAndWait(); |
| + CompleteLoading(); |
| + loop->Run(); |
| } |
| TEST_F(DeferredCookieTaskTest, DeferredDeleteSessionCookies) { |
| @@ -1163,10 +1174,11 @@ TEST_F(DeferredCookieTaskTest, DeferredDeleteSessionCookies) { |
| EXPECT_CALL(delete_callback, Invoke(false)) |
| .WillOnce( |
| DeleteSessionCookiesAction(&cookie_monster(), &delete_callback)); |
| - EXPECT_CALL(delete_callback, Invoke(false)) |
| - .WillOnce(QuitCurrentMessageLoop()); |
| + scoped_ptr<base::RunLoop> loop(new base::RunLoop); |
| + EXPECT_CALL(delete_callback, Invoke(false)).WillOnce(QuitRunLoop(loop.get())); |
| - CompleteLoadingAndWait(); |
| + CompleteLoading(); |
| + loop->Run(); |
| } |
| // Verify that a series of queued tasks are executed in order upon loading of |
| @@ -1188,7 +1200,7 @@ TEST_F(DeferredCookieTaskTest, DeferredTaskOrder) { |
| SetCookieAction(&cookie_monster(), http_www_google_.url(), "A=B", |
| &set_cookies_callback))); |
| ExpectLoadCall(); |
| - ExpectLoadForKeyCall(http_www_google_.domain(), false); |
| + ExpectLoadForKeyCall(http_www_google_.domain()); |
| Begin(); |
| WaitForLoadCall(); |
| @@ -1196,10 +1208,12 @@ TEST_F(DeferredCookieTaskTest, DeferredTaskOrder) { |
| .WillOnce(GetCookiesAction(&cookie_monster(), http_www_google_.url(), |
| &get_cookies_callback_deferred)); |
| EXPECT_CALL(set_cookies_callback, Invoke(true)); |
| + scoped_ptr<base::RunLoop> loop(new base::RunLoop); |
| EXPECT_CALL(get_cookies_callback_deferred, Invoke("A=B; X=1")) |
| - .WillOnce(QuitCurrentMessageLoop()); |
| + .WillOnce(QuitRunLoop(loop.get())); |
| - CompleteLoadingAndWait(); |
| + CompleteLoading(); |
| + loop->Run(); |
| } |
| TEST_F(CookieMonsterTest, TestCookieDeleteAll) { |
| @@ -2591,7 +2605,6 @@ class MultiThreadedCookieMonsterTest : public CookieMonsterTest { |
| void RunOnOtherThread(const base::Closure& task) { |
| other_thread_.Start(); |
| other_thread_.task_runner()->PostTask(FROM_HERE, task); |
| - RunFor(kTimeout); |
| other_thread_.Stop(); |
| } |
| @@ -2614,6 +2627,7 @@ TEST_F(MultiThreadedCookieMonsterTest, ThreadCheckGetAllCookies) { |
| base::Bind(&MultiThreadedCookieMonsterTest::GetAllCookiesTask, |
| base::Unretained(this), cm, &callback); |
| RunOnOtherThread(task); |
| + callback.WaitUntilDone(); |
| EXPECT_TRUE(callback.did_run()); |
| it = callback.cookies().begin(); |
| ASSERT_TRUE(it != callback.cookies().end()); |
| @@ -2636,6 +2650,7 @@ TEST_F(MultiThreadedCookieMonsterTest, ThreadCheckGetAllCookiesForURL) { |
| base::Bind(&MultiThreadedCookieMonsterTest::GetAllCookiesForURLTask, |
| base::Unretained(this), cm, http_www_google_.url(), &callback); |
| RunOnOtherThread(task); |
| + callback.WaitUntilDone(); |
| EXPECT_TRUE(callback.did_run()); |
| it = callback.cookies().begin(); |
| ASSERT_TRUE(it != callback.cookies().end()); |
| @@ -2660,6 +2675,7 @@ TEST_F(MultiThreadedCookieMonsterTest, ThreadCheckGetAllCookiesForURLWithOpt) { |
| &MultiThreadedCookieMonsterTest::GetAllCookiesForURLWithOptionsTask, |
| base::Unretained(this), cm, http_www_google_.url(), options, &callback); |
| RunOnOtherThread(task); |
| + callback.WaitUntilDone(); |
| EXPECT_TRUE(callback.did_run()); |
| it = callback.cookies().begin(); |
| ASSERT_TRUE(it != callback.cookies().end()); |
| @@ -2678,6 +2694,7 @@ TEST_F(MultiThreadedCookieMonsterTest, ThreadCheckSetCookieWithDetails) { |
| base::Bind(&MultiThreadedCookieMonsterTest::SetCookieWithDetailsTask, |
| base::Unretained(this), cm, www_google_foo_.url(), &callback); |
| RunOnOtherThread(task); |
| + callback.WaitUntilDone(); |
| EXPECT_TRUE(callback.did_run()); |
| EXPECT_TRUE(callback.result()); |
| } |
| @@ -2698,6 +2715,7 @@ TEST_F(MultiThreadedCookieMonsterTest, ThreadCheckDeleteAllCreatedBetween) { |
| base::Unretained(this), cm, now - TimeDelta::FromDays(99), |
| Time(), &callback); |
| RunOnOtherThread(task); |
| + callback.WaitUntilDone(); |
| EXPECT_TRUE(callback.did_run()); |
| EXPECT_EQ(1, callback.result()); |
| } |
| @@ -2715,6 +2733,7 @@ TEST_F(MultiThreadedCookieMonsterTest, ThreadCheckDeleteAllForHost) { |
| base::Bind(&MultiThreadedCookieMonsterTest::DeleteAllForHostTask, |
| base::Unretained(this), cm, http_www_google_.url(), &callback); |
| RunOnOtherThread(task); |
| + callback.WaitUntilDone(); |
| EXPECT_TRUE(callback.did_run()); |
| EXPECT_EQ(1, callback.result()); |
| } |
| @@ -2762,6 +2781,7 @@ TEST_F(MultiThreadedCookieMonsterTest, |
| base::Unretained(this), cm, ago1, Time(), http_www_google_.url(), |
| &callback); |
| RunOnOtherThread(task); |
| + callback.WaitUntilDone(); |
| EXPECT_TRUE(callback.did_run()); |
| EXPECT_EQ(2, callback.result()); // Deletes A=B, G=H. |
| } |
| @@ -2784,6 +2804,7 @@ TEST_F(MultiThreadedCookieMonsterTest, ThreadCheckDeleteCanonicalCookie) { |
| base::Bind(&MultiThreadedCookieMonsterTest::DeleteCanonicalCookieTask, |
| base::Unretained(this), cm, *it, &callback); |
| RunOnOtherThread(task); |
| + callback.WaitUntilDone(); |
| EXPECT_TRUE(callback.did_run()); |
| EXPECT_TRUE(callback.result()); |
| } |