patch from 1011683002 w/o audio thread fix

chrome/browser/metrics/thread_watcher_unittest.cc

Index: chrome/browser/metrics/thread_watcher_unittest.cc
diff --git a/chrome/browser/metrics/thread_watcher_unittest.cc b/chrome/browser/metrics/thread_watcher_unittest.cc
index a53cd490d79b5e5bf46b583e5a9a9169a76bd964..97084925a15f34e44ccb295ef8563a0feb7affc5 100644
--- a/chrome/browser/metrics/thread_watcher_unittest.cc
+++ b/chrome/browser/metrics/thread_watcher_unittest.cc
@@ -257,9 +257,9 @@ class ThreadWatcherTest : public ::testing::Test {
     db_thread_.reset(new content::TestBrowserThread(BrowserThread::DB));
     io_thread_.reset(new content::TestBrowserThread(BrowserThread::IO));
     watchdog_thread_.reset(new WatchDogThread());
-    db_thread_->Start();
-    io_thread_->Start();
-    watchdog_thread_->Start();
+    db_thread_->StartAndWait();
+    io_thread_->StartAndWait();
+    watchdog_thread_->StartAndWait();
 
     WatchDogThread::PostTask(
         FROM_HERE,
@@ -690,7 +690,7 @@ TEST_F(ThreadWatcherListTest, Restart) {
   content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop_for_ui);
 
   scoped_ptr<WatchDogThread> watchdog_thread_(new WatchDogThread());
-  watchdog_thread_->Start();
+  watchdog_thread_->StartAndWait();
 
   // See http://crbug.com/347887.
   // StartWatchingAll() will PostDelayedTask to create g_thread_watcher_list_,