Use content::RunBlockingPoolTask() in tests.

components/visitedlink/test/visitedlink_unittest.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 <cstdio>
 #include <string>
 #include <vector>
 
 #include "base/file_util.h"
 #include "base/memory/shared_memory.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/process/process_handle.h"
 #include "base/run_loop.h"
 #include "base/strings/string_util.h"
 #include "base/time/time.h"
 #include "components/visitedlink/browser/visitedlink_delegate.h"
 #include "components/visitedlink/browser/visitedlink_event_listener.h"
 #include "components/visitedlink/browser/visitedlink_master.h"
 #include "components/visitedlink/common/visitedlink_messages.h"
 #include "components/visitedlink/renderer/visitedlink_slave.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "content/public/test/test_browser_context.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "content/public/test/test_renderer_host.h"
+#include "content/public/test/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
 using content::BrowserThread;
 using content::MockRenderProcessHost;
 using content::RenderViewHostTester;
 
 namespace visitedlink {
 
 namespace {
@@ skipping 13 matching lines @@
 std::vector<VisitedLinkSlave*> g_slaves;
 
 class TestVisitedLinkDelegate : public VisitedLinkDelegate {
  public:
   virtual void RebuildTable(
       const scoped_refptr<URLEnumerator>& enumerator) OVERRIDE;
 
   void AddURLForRebuild(const GURL& url);
 
  private:
-
   URLs rebuild_urls_;
 };
 
 void TestVisitedLinkDelegate::RebuildTable(
     const scoped_refptr<URLEnumerator>& enumerator) {
   for (URLs::const_iterator itr = rebuild_urls_.begin();
        itr != rebuild_urls_.end();
        ++itr)
     enumerator->OnURL(*itr);
   enumerator->OnComplete(true);
@@ skipping 79 matching lines @@
     return master_->Init();
   }
 
   // May be called multiple times (some tests will do this to clear things,
   // and TearDown will do this to make sure eveything is shiny before quitting.
   void ClearDB() {
     if (master_.get())
       master_.reset(NULL);
 
     // Wait for all pending file I/O to be completed.
-    BrowserThread::GetBlockingPool()->FlushForTesting();
+    content::RunAllBlockingPoolTasksUntilIdle();
   }
 
   // Loads the database from disk and makes sure that the same URLs are present
   // as were generated by TestIO_Create(). This also checks the URLs with a
   // slave to make sure it reads the data properly.
   void Reload() {
     // Clean up after our caller, who may have left the database open.
     ClearDB();
 
     ASSERT_TRUE(InitVisited(0, true));
@@ skipping 405 matching lines @@
  public:
   VisitedLinkRenderProcessHostFactory()
       : content::RenderProcessHostFactory() {}
   virtual content::RenderProcessHost* CreateRenderProcessHost(
       content::BrowserContext* browser_context,
       content::SiteInstance* site_instance) const OVERRIDE {
     return new VisitRelayingRenderProcessHost(browser_context);
   }
 
  private:
-
   DISALLOW_COPY_AND_ASSIGN(VisitedLinkRenderProcessHostFactory);
 };
 
 class VisitedLinkEventsTest : public content::RenderViewHostTestHarness {
  public:
   virtual void SetUp() {
     SetRenderProcessHostFactory(&vc_rph_factory_);
     content::RenderViewHostTestHarness::SetUp();
   }
 
@@ skipping 160 matching lines @@
   VisitCountingContext different_context;
   VisitRelayingRenderProcessHost different_process_host(&different_context);
 
   content::NotificationService::current()->Notify(
       content::NOTIFICATION_RENDERER_PROCESS_CREATED,
       content::Source<content::RenderProcessHost>(&different_process_host),
       content::NotificationService::NoDetails());
   WaitForCoalescense();
 
   EXPECT_EQ(0, different_context.new_table_count());
-
 }
 
 }  // namespace visitedlink