| Index: chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc
|
| diff --git a/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc b/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc
|
| index 1cfe3524f3dc9f2386a3881dee6593b5400cdfcb..5c00ff34c04b0c96e632f5b5531022f4c295d4c0 100644
|
| --- a/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc
|
| +++ b/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc
|
| @@ -70,6 +70,7 @@ class ConflictResolverTest : public testing::Test {
|
| context_.reset(new SyncEngineContext(
|
| fake_drive_service.PassAs<drive::DriveServiceInterface>(),
|
| drive_uploader.Pass(),
|
| + NULL,
|
| base::MessageLoopProxy::current(),
|
| base::MessageLoopProxy::current(),
|
| base::MessageLoopProxy::current()));
|
|
|