Worker changes to prepare for lock-free shutdown.

chrome/browser/sync/glue/browser_thread_model_worker_unittest.cc

Index: chrome/browser/sync/glue/browser_thread_model_worker_unittest.cc
diff --git a/chrome/browser/sync/glue/browser_thread_model_worker_unittest.cc b/chrome/browser/sync/glue/browser_thread_model_worker_unittest.cc
index c77407528fbf77610eb3346f8bdbddffe17e8b56..9239bb6269feafcd0a42f81905e50846cbd55e0f 100644
--- a/chrome/browser/sync/glue/browser_thread_model_worker_unittest.cc
+++ b/chrome/browser/sync/glue/browser_thread_model_worker_unittest.cc
@@ -50,7 +50,7 @@ class SyncBrowserThreadModelWorkerTest : public testing::Test {
         TestTimeouts::action_timeout(),
         this,
         &SyncBrowserThreadModelWorkerTest::Timeout);
-    worker()->DoWorkAndWaitUntilDone(c);
+    worker()->HandleWork(c);
   }
 
   // This is the work that will be scheduled to be done on the DB thread.
@@ -74,7 +74,7 @@ class SyncBrowserThreadModelWorkerTest : public testing::Test {
  protected:
   virtual void SetUp() {
     db_thread_.Start();
-    worker_ = new DatabaseModelWorker();
+    worker_ = new DatabaseModelWorker(NULL);
   }
 
   virtual void Teardown() {