Fix leak in DatabaseWorkerModelTest.

chrome/browser/sync/glue/database_model_worker_unittest.cc

 // Copyright (c) 2010 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 "base/scoped_ptr.h"
 #include "base/thread.h"
 #include "base/timer.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/sync/glue/database_model_worker.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 16 matching lines @@
   bool did_do_work() { return did_do_work_; }
   DatabaseModelWorker* worker() { return worker_.get(); }
   OneShotTimer<DatabaseModelWorkerTest>* timer() { return &timer_; }
   ScopedRunnableMethodFactory<DatabaseModelWorkerTest>* factory() {
     return &method_factory_;
   }
 
   // Schedule DoWork to be executed on the DB thread and have the test fail if
   // DoWork hasn't executed within 10 seconds.
   void ScheduleWork() {
+    scoped_ptr<Closure> c(NewCallback(this, &DatabaseModelWorkerTest::DoWork));
     timer()->Start(TimeDelta::FromSeconds(10),
                    this, &DatabaseModelWorkerTest::Timeout);
-    worker()->DoWorkAndWaitUntilDone(
-        NewCallback(this, &DatabaseModelWorkerTest::DoWork));
+    worker()->DoWorkAndWaitUntilDone(c.get());
   }
 
   // This is the work that will be scheduled to be done on the DB thread.
   void DoWork() {
     EXPECT_TRUE(ChromeThread::CurrentlyOn(ChromeThread::DB));
     timer_.Stop();  // Stop the failure timer so the test succeeds.
     ChromeThread::PostTask(
         ChromeThread::IO, FROM_HERE, new MessageLoop::QuitTask());
     did_do_work_ = true;
   }
@@ skipping 30 matching lines @@
 };
 
 TEST_F(DatabaseModelWorkerTest, DoesWorkOnDatabaseThread) {
   MessageLoop::current()->PostTask(FROM_HERE, factory()->NewRunnableMethod(
       &DatabaseModelWorkerTest::ScheduleWork));
   MessageLoop::current()->Run();
   EXPECT_TRUE(did_do_work());
 }
 
 }  // namespace