Worker changes to prepare for lock-free shutdown.

chrome/browser/sync/glue/ui_model_worker_unittest.cc

Index: chrome/browser/sync/glue/ui_model_worker_unittest.cc
diff --git a/chrome/browser/sync/glue/ui_model_worker_unittest.cc b/chrome/browser/sync/glue/ui_model_worker_unittest.cc
index e4de2822c2bab704ef747cec7a6bd5604c4bd0b2..bff7e25737e4df9ec312ebe087f1276c2d45ce58 100644
--- a/chrome/browser/sync/glue/ui_model_worker_unittest.cc
+++ b/chrome/browser/sync/glue/ui_model_worker_unittest.cc
@@ -52,7 +52,7 @@ class Syncer {
     // We wait until the callback is executed. So it is safe to use Unretained.
     syncer::WorkCallback c = base::Bind(&UIModelWorkerVisitor::DoWork,
                                        base::Unretained(visitor));
-    worker_->DoWorkAndWaitUntilDone(c);
+    worker_->HandleWork(c);
   }
  private:
   scoped_refptr<UIModelWorker> worker_;
@@ -89,7 +89,7 @@ class SyncUIModelWorkerTest : public testing::Test {
     faux_syncer_thread_.Start();
     ui_thread_.reset(new content::TestBrowserThread(BrowserThread::UI,
                                                     &faux_ui_loop_));
-    bmw_ = new UIModelWorker();
+    bmw_ = new UIModelWorker(NULL);
     syncer_.reset(new Syncer(bmw_.get()));
   }