| 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 63e6322550e0dedbf663e3daa57ea6884df451bb..a403f6b77e248dfee522b4b786c8e5a96c78b260 100644
|
| --- a/chrome/browser/sync/glue/browser_thread_model_worker_unittest.cc
|
| +++ b/chrome/browser/sync/glue/browser_thread_model_worker_unittest.cc
|
| @@ -9,6 +9,7 @@
|
| #include "base/test/test_timeouts.h"
|
| #include "base/timer.h"
|
| #include "chrome/browser/sync/glue/browser_thread_model_worker.h"
|
| +#include "chrome/browser/sync/sessions/unrecoverable_error_info.h"
|
| #include "content/browser/browser_thread.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| @@ -38,7 +39,8 @@ class BrowserThreadModelWorkerTest : public testing::Test {
|
| // Schedule DoWork to be executed on the DB thread and have the test fail if
|
| // DoWork hasn't executed within action_timeout_ms() ms.
|
| void ScheduleWork() {
|
| - scoped_ptr<Callback0::Type> c(NewCallback(this,
|
| + scoped_ptr<Callback1<sessions::UnrecoverableErrorInfo*>::Type> c(
|
| + NewCallback(this,
|
| &BrowserThreadModelWorkerTest::DoWork));
|
| timer()->Start(
|
| FROM_HERE,
|
| @@ -49,7 +51,7 @@ class BrowserThreadModelWorkerTest : public testing::Test {
|
| }
|
|
|
| // This is the work that will be scheduled to be done on the DB thread.
|
| - void DoWork() {
|
| + void DoWork(sessions::UnrecoverableErrorInfo* error_info) {
|
| EXPECT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::DB));
|
| timer_.Stop(); // Stop the failure timer so the test succeeds.
|
| BrowserThread::PostTask(
|
|
|