Remove MessageLoop::current()->RunUntilIdle() in net.

net/cookies/cookie_monster_perftest.cc

 // 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.
 
 #include <algorithm>
 #include <memory>
 
 #include "base/bind.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop.h"
+#include "base/run_loop.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/perf_time_logger.h"
 #include "net/cookies/canonical_cookie.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/cookies/cookie_monster_store_test.h"
 #include "net/cookies/parsed_cookie.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
@@ skipping 21 matching lines @@
  public:
   BaseCallback() : has_run_(false) {}
 
  protected:
   void WaitForCallback() {
     // Note that the performance tests currently all operate on a loaded cookie
     // store (or, more precisely, one that has no backing persistent store).
     // Therefore, callbacks will actually always complete synchronously. If the
     // tests get more advanced we need to add other means of signaling
     // completion.
-    base::MessageLoop::current()->RunUntilIdle();
+    base::RunLoop().RunUntilIdle();
     EXPECT_TRUE(has_run_);
     has_run_ = false;
   }
 
   void Run() { has_run_ = true; }
 
   bool has_run_;
 };
 
 class SetCookieCallback : public BaseCallback {
@@ skipping 79 matching lines @@
 
   base::PerfTimeLogger timer2("Cookie_monster_query_single_host");
   for (std::vector<std::string>::const_iterator it = cookies.begin();
        it != cookies.end(); ++it) {
     getCookiesCallback.GetCookies(cm.get(), GURL(kGoogleURL));
   }
   timer2.Done();
 
   base::PerfTimeLogger timer3("Cookie_monster_deleteall_single_host");
   cm->DeleteAllAsync(CookieMonster::DeleteCallback());
-  base::MessageLoop::current()->RunUntilIdle();
+  base::RunLoop().RunUntilIdle();
   timer3.Done();
 }
 
 TEST_F(CookieMonsterTest, TestAddCookieOnManyHosts) {
   std::unique_ptr<CookieMonster> cm(new CookieMonster(nullptr, nullptr));
   std::string cookie(kCookieLine);
   std::vector<GURL> gurls;  // just wanna have ffffuunnn
   for (int i = 0; i < kNumCookies; ++i) {
     gurls.push_back(GURL(base::StringPrintf("https://a%04d.izzle", i)));
   }
@@ skipping 12 matching lines @@
 
   base::PerfTimeLogger timer2("Cookie_monster_query_many_hosts");
   for (std::vector<GURL>::const_iterator it = gurls.begin(); it != gurls.end();
        ++it) {
     getCookiesCallback.GetCookies(cm.get(), *it);
   }
   timer2.Done();
 
   base::PerfTimeLogger timer3("Cookie_monster_deleteall_many_hosts");
   cm->DeleteAllAsync(CookieMonster::DeleteCallback());
-  base::MessageLoop::current()->RunUntilIdle();
+  base::RunLoop().RunUntilIdle();
   timer3.Done();
 }
 
 TEST_F(CookieMonsterTest, TestDomainTree) {
   std::unique_ptr<CookieMonster> cm(new CookieMonster(nullptr, nullptr));
   GetCookiesCallback getCookiesCallback;
   SetCookieCallback setCookieCallback;
   const char domain_cookie_format_tree[] = "a=b; domain=%s";
   const std::string domain_base("top.com");
 
@@ skipping 185 matching lines @@
     setCookieCallback.SetCookie(cm.get(), gurl, cookie_line);
 
     base::PerfTimeLogger timer((std::string("GC_") + test_case.name).c_str());
     for (int i = 0; i < kNumCookies; i++)
       setCookieCallback.SetCookie(cm.get(), gurl, cookie_line);
     timer.Done();
   }
 }
 
 }  // namespace net