Wait for URLBlacklist update tasks on automation tests.

content/browser/browser_thread.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.
 
 #include "content/browser/browser_thread.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
+#include "base/synchronization/waitable_event.h"
 #include "base/threading/thread_restrictions.h"
 
 // Friendly names for the well-known threads.
 static const char* browser_thread_names[BrowserThread::ID_COUNT] = {
   "",  // UI (name assembled in browser_main.cc).
   "Chrome_DBThread",  // DB
   "Chrome_WebKitThread",  // WEBKIT
   "Chrome_FileThread",  // FILE
   "Chrome_ProcessLauncherThread",  // PROCESS_LAUNCHER
   "Chrome_CacheThread",  // CACHE
@@ skipping 225 matching lines @@
         browser_threads_[i]->message_loop() == cur_message_loop) {
       *identifier = browser_threads_[i]->identifier_;
       return true;
     }
   }
 
   return false;
 }
 
 // static
+bool BrowserThread::WaitForPendingTasksOn(ID identifier) {
+  // Avoid deadlocking self.
+  if (CurrentlyOn(identifier))
+    return false;
+  base::WaitableEvent event(true   /* manual reset */,
+                            false  /* not initially signaled */);
+  if (!PostTask(identifier,
+                FROM_HERE,
+                base::Bind(&base::WaitableEvent::Signal,
+                           base::Unretained(&event))))
+    return false;
+  event.Wait();
+  return true;
+}
+
+// static
 scoped_refptr<base::MessageLoopProxy>
 BrowserThread::GetMessageLoopProxyForThread(
     ID identifier) {
   scoped_refptr<base::MessageLoopProxy> proxy(
       new BrowserThreadMessageLoopProxy(identifier));
   return proxy;
 }
 
 // static
 bool BrowserThread::PostTaskHelper(
@@ skipping 66 matching lines @@
     } else {
       message_loop->PostNonNestableDelayedTask(from_here, task, delay_ms);
     }
   }
 
   if (!guaranteed_to_outlive_target_thread)
     lock_.Release();
 
   return !!message_loop;
 }