summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-28 04:40:16 +0000
committerviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-28 04:40:16 +0000
commit1116122dc4674b78e2cb2e5aa341f84b4df01761 (patch)
treeacc9bd4be5ff9764c77a9f979066b52a7fe442b1
parent5d225c1037dde2b26fb680c0cc9f6af73d790b65 (diff)
downloadchromium_src-1116122dc4674b78e2cb2e5aa341f84b4df01761.zip
chromium_src-1116122dc4674b78e2cb2e5aa341f84b4df01761.tar.gz
chromium_src-1116122dc4674b78e2cb2e5aa341f84b4df01761.tar.bz2
Revert 37372 - Fix leak in DatabaseWorkerModelTest.
BUG=none TEST=none TBR=tim Review URL: http://codereview.chromium.org/557029 TBR=albertb@google.com, victorw@chromium.org, rolandsteiner@chromium.org Review URL: http://codereview.chromium.org/548175 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37379 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/sync/glue/database_model_worker_unittest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/sync/glue/database_model_worker_unittest.cc b/chrome/browser/sync/glue/database_model_worker_unittest.cc
index 69ad5ce..81c8e67 100644
--- a/chrome/browser/sync/glue/database_model_worker_unittest.cc
+++ b/chrome/browser/sync/glue/database_model_worker_unittest.cc
@@ -34,10 +34,10 @@ class DatabaseModelWorkerTest : public testing::Test {
// 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(c.get());
+ worker()->DoWorkAndWaitUntilDone(
+ NewCallback(this, &DatabaseModelWorkerTest::DoWork));
}
// This is the work that will be scheduled to be done on the DB thread.