Convert CookieMonster tests to use base::RunLoop

net/cookies/cookie_store_test_callbacks.h

 // Copyright (c) 2012 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.
 
 #ifndef NET_COOKIES_COOKIE_STORE_TEST_CALLBACKS_H_
 #define NET_COOKIES_COOKIE_STORE_TEST_CALLBACKS_H_
 
 #include <string>
 #include <vector>
 
+#include "base/run_loop.h"
 #include "net/cookies/canonical_cookie.h"
 #include "net/cookies/cookie_store.h"
 
 namespace base {
 class MessageLoop;
 class Thread;
 }
 
 namespace net {
 
 // Defines common behaviour for the callbacks from GetCookies, SetCookies, etc.
 // Asserts that the current thread is the expected invocation thread, sends a
 // quit to the thread in which it was constructed.
 class CookieCallback {
  public:
   // Indicates whether the callback has been called.
   bool did_run() { return did_run_; }

[mmenke, 2016/01/27 16:55:42]

This is no longer needed - the fact that the message loop is exited should be
sufficient evidence this did run (If any other tests post a stray quit message,
like the tests you're fixing did, that's their fault - shouldn't be up to these
tests to detect that)

[xunjieli, 2016/01/27 18:35:02]

Done.

 
+  // Waits until the callback is invoked.
+  void WaitUntilDone();
+
  protected:
   // Constructs a callback that expects to be called in the given thread and
   // will, upon execution, send a QUIT to the constructing thread.
   explicit CookieCallback(base::Thread* run_in_thread);
 
   // Constructs a callback that expects to be called in current thread and will
   // send a QUIT to the constructing thread.
   CookieCallback();
 
+  ~CookieCallback();
+
   // Tests whether the current thread was the caller's thread.
   // Sends a QUIT to the constructing thread.
   void CallbackEpilogue();
 
  private:
   bool did_run_;
   base::Thread* run_in_thread_;
   base::MessageLoop* run_in_loop_;
-  base::MessageLoop* parent_loop_;
-  base::MessageLoop* loop_to_quit_;
+  scoped_ptr<base::RunLoop> loop_to_quit_;

[mmenke, 2016/01/27 16:55:42]

No need to use a scoped_ptr.

[xunjieli, 2016/01/27 18:35:02]

Done.

 };
 
 // Callback implementations for the asynchronous CookieStore methods.
 
 template <typename T>
 class ResultSavingCookieCallback : public CookieCallback {
  public:
   ResultSavingCookieCallback() {
   }
   explicit ResultSavingCookieCallback(base::Thread* run_in_thread)
@@ skipping 48 matching lines @@
 
   const CookieList& cookies() { return cookies_; }
 
  private:
   CookieList cookies_;
 };
 
 }  // namespace net
 
 #endif  // NET_COOKIES_COOKIE_STORE_TEST_CALLBACKS_H_