Convert CookieMonster tests to use base::RunLoop

net/cookies/cookie_store_unittest.h

Index: net/cookies/cookie_store_unittest.h
diff --git a/net/cookies/cookie_store_unittest.h b/net/cookies/cookie_store_unittest.h
index da8cd13202ae374ddeaaaba3631e372b75f23cca..dd2d4493be33f548354355fefb041c3626762e0e 100644
--- a/net/cookies/cookie_store_unittest.h
+++ b/net/cookies/cookie_store_unittest.h
@@ -109,7 +109,7 @@ class CookieStoreTest : public testing::Test {
         url, options,
         base::Bind(&StringResultCookieCallback::Run,
                    base::Unretained(&callback)));
-    RunFor(kTimeout);
+    callback.WaitUntilDone();
     EXPECT_TRUE(callback.did_run());
     return callback.result();
   }
@@ -122,7 +122,7 @@ class CookieStoreTest : public testing::Test {
     cs->GetCookiesWithOptionsAsync(
         url, options, base::Bind(&StringResultCookieCallback::Run,
                                  base::Unretained(&callback)));
-    RunFor(kTimeout);
+    callback.WaitUntilDone();
     EXPECT_TRUE(callback.did_run());
     return callback.result();
   }
@@ -132,7 +132,7 @@ class CookieStoreTest : public testing::Test {
     GetCookieListCallback callback;
     cs->GetAllCookiesAsync(
         base::Bind(&GetCookieListCallback::Run, base::Unretained(&callback)));
-    RunFor(kTimeout);
+    callback.WaitUntilDone();
     EXPECT_TRUE(callback.did_run());
     return callback.cookies();
   }
@@ -148,7 +148,7 @@ class CookieStoreTest : public testing::Test {
         base::Bind(
             &ResultSavingCookieCallback<bool>::Run,
             base::Unretained(&callback)));
-    RunFor(kTimeout);
+    callback.WaitUntilDone();
     EXPECT_TRUE(callback.did_run());
     return callback.result();
   }
@@ -183,7 +183,7 @@ class CookieStoreTest : public testing::Test {
     cs->DeleteCookieAsync(
         url, cookie_name,
         base::Bind(&NoResultCookieCallback::Run, base::Unretained(&callback)));
-    RunFor(kTimeout);
+    callback.WaitUntilDone();
     EXPECT_TRUE(callback.did_run());
   }
 
@@ -197,7 +197,7 @@ class CookieStoreTest : public testing::Test {
         base::Bind(
             &ResultSavingCookieCallback<int>::Run,
             base::Unretained(&callback)));
-    RunFor(kTimeout);
+    callback.WaitUntilDone();
     EXPECT_TRUE(callback.did_run());
     return callback.result();
   }
@@ -213,7 +213,7 @@ class CookieStoreTest : public testing::Test {
         base::Bind(
             &ResultSavingCookieCallback<int>::Run,
             base::Unretained(&callback)));
-    RunFor(kTimeout);
+    callback.WaitUntilDone();
     EXPECT_TRUE(callback.did_run());
     return callback.result();
   }
@@ -225,21 +225,11 @@ class CookieStoreTest : public testing::Test {
         base::Bind(
             &ResultSavingCookieCallback<int>::Run,
             base::Unretained(&callback)));
-    RunFor(kTimeout);
+    callback.WaitUntilDone();
     EXPECT_TRUE(callback.did_run());
     return callback.result();
   }
 
-  void RunFor(int ms) {
-    // Runs the test thread message loop for up to |ms| milliseconds.
-    base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
-        FROM_HERE, base::Bind(&base::MessageLoop::QuitWhenIdle,
-                              weak_factory_->GetWeakPtr()),
-        base::TimeDelta::FromMilliseconds(ms));
-    base::MessageLoop::current()->Run();
-    weak_factory_->InvalidateWeakPtrs();
-  }
-
   scoped_refptr<CookieStore> GetCookieStore() {
     return CookieStoreTestTraits::Create();
   }
@@ -1218,7 +1208,6 @@ class MultiThreadedCookieStoreTest :
   void RunOnOtherThread(const base::Closure& task) {
     other_thread_.Start();
     other_thread_.task_runner()->PostTask(FROM_HERE, task);
-    CookieStoreTest<CookieStoreTestTraits>::RunFor(kTimeout);
     other_thread_.Stop();
   }
 
@@ -1240,6 +1229,7 @@ TYPED_TEST_P(MultiThreadedCookieStoreTest, ThreadCheckGetCookies) {
       &MultiThreadedCookieStoreTest<TypeParam>::GetCookiesTask,
       base::Unretained(this), cs, this->http_www_google_.url(), &callback);
   this->RunOnOtherThread(task);
+  callback.WaitUntilDone();
   EXPECT_TRUE(callback.did_run());
   EXPECT_EQ("A=B", callback.result());
 }
@@ -1259,6 +1249,7 @@ TYPED_TEST_P(MultiThreadedCookieStoreTest, ThreadCheckGetCookiesWithOptions) {
       base::Unretained(this), cs, this->http_www_google_.url(), options,
       &callback);
   this->RunOnOtherThread(task);
+  callback.WaitUntilDone();
   EXPECT_TRUE(callback.did_run());
   EXPECT_EQ("A=B", callback.result());
 }
@@ -1276,6 +1267,7 @@ TYPED_TEST_P(MultiThreadedCookieStoreTest, ThreadCheckSetCookieWithOptions) {
       base::Unretained(this), cs, this->http_www_google_.url(), "A=B", options,
       &callback);
   this->RunOnOtherThread(task);
+  callback.WaitUntilDone();
   EXPECT_TRUE(callback.did_run());
   EXPECT_TRUE(callback.result());
 }
@@ -1295,6 +1287,7 @@ TYPED_TEST_P(MultiThreadedCookieStoreTest, ThreadCheckDeleteCookie) {
       &MultiThreadedCookieStoreTest<TypeParam>::DeleteCookieTask,
       base::Unretained(this), cs, this->http_www_google_.url(), "A", &callback);
   this->RunOnOtherThread(task);
+  callback.WaitUntilDone();
   EXPECT_TRUE(callback.did_run());
 }
 
@@ -1317,6 +1310,7 @@ TYPED_TEST_P(MultiThreadedCookieStoreTest, ThreadCheckDeleteSessionCookies) {
       &MultiThreadedCookieStoreTest<TypeParam>::DeleteSessionCookiesTask,
       base::Unretained(this), cs, &callback);
   this->RunOnOtherThread(task);
+  callback.WaitUntilDone();
   EXPECT_TRUE(callback.did_run());
   EXPECT_EQ(1, callback.result());
 }