Wait for URLBlacklist update tasks on automation tests.

chrome/browser/net/gaia/token_service_unittest.cc

 // Copyright (c) 2011 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.
 //
 // This file defines a unit test for the profile's token service.
 
 #include "chrome/browser/net/gaia/token_service_unittest.h"
 
 #include "base/command_line.h"
 #include "base/synchronization/waitable_event.h"
@@ skipping 72 matching lines @@
 
   db_thread_.Stop();
   MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask);
   MessageLoop::current()->Run();
 }
 
 void TokenServiceTestHarness::WaitForDBLoadCompletion() {
   // The WebDB does all work on the DB thread. This will add an event
   // to the end of the DB thread, so when we reach this task, all DB
   // operations should be complete.
-  base::WaitableEvent done(false, false);
-  BrowserThread::PostTask(
-      BrowserThread::DB, FROM_HERE, new SignalingTask(&done));
-  done.Wait();
+  CHECK(BrowserThread::WaitForPendingTasksOn(BrowserThread::DB));
 
   // Notifications should be returned from the DB thread onto the UI thread.
   message_loop_.RunAllPending();
 }
 
 class TokenServiceTest : public TokenServiceTestHarness {
  public:
   virtual void SetUp() {
     TokenServiceTestHarness::SetUp();
     service_.UpdateCredentials(credentials_);
@@ skipping 340 matching lines @@
 
     *CommandLine::ForCurrentProcess() = original_cl;
   }
 };
 
 TEST_F(TokenServiceCommandLineTest, TestValueOverride) {
   EXPECT_TRUE(service_.HasTokenForService("my_service"));
   EXPECT_EQ("my_value", service_.GetTokenForService("my_service"));
 }
 #endif   // ifndef NDEBUG