| 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 82c3e50cd5032b801d9bb5936278230185934f3e..06e1e82436a5e2509227a9c9f491ef1984cfeb29 100644
|
| --- a/chrome/browser/sync/glue/browser_thread_model_worker_unittest.cc
|
| +++ b/chrome/browser/sync/glue/browser_thread_model_worker_unittest.cc
|
| @@ -42,8 +42,9 @@ class SyncBrowserThreadModelWorkerTest : public testing::Test {
|
| // DoWork hasn't executed within action_timeout_ms() ms.
|
| void ScheduleWork() {
|
| // We wait until the callback is done. So it is safe to use unretained.
|
| - csync::WorkCallback c = base::Bind(&SyncBrowserThreadModelWorkerTest::DoWork,
|
| - base::Unretained(this));
|
| + syncer::WorkCallback c =
|
| + base::Bind(&SyncBrowserThreadModelWorkerTest::DoWork,
|
| + base::Unretained(this));
|
| timer()->Start(
|
| FROM_HERE,
|
| TimeDelta::FromMilliseconds(TestTimeouts::action_timeout_ms()),
|
| @@ -53,13 +54,13 @@ class SyncBrowserThreadModelWorkerTest : public testing::Test {
|
| }
|
|
|
| // This is the work that will be scheduled to be done on the DB thread.
|
| - csync::SyncerError DoWork() {
|
| + syncer::SyncerError DoWork() {
|
| EXPECT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::DB));
|
| timer_.Stop(); // Stop the failure timer so the test succeeds.
|
| BrowserThread::PostTask(
|
| BrowserThread::IO, FROM_HERE, MessageLoop::QuitClosure());
|
| did_do_work_ = true;
|
| - return csync::SYNCER_OK;
|
| + return syncer::SYNCER_OK;
|
| }
|
|
|
| // This will be called by the OneShotTimer and make the test fail unless
|
|
|