OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/sync_file_system/drive_backend/conflict_resolver.h" | 5 #include "chrome/browser/sync_file_system/drive_backend/conflict_resolver.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/callback.h" | 8 #include "base/callback.h" |
9 #include "base/file_util.h" | 9 #include "base/file_util.h" |
10 #include "base/files/scoped_temp_dir.h" | 10 #include "base/files/scoped_temp_dir.h" |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
63 drive_uploader(new FakeDriveUploader(fake_drive_service.get())); | 63 drive_uploader(new FakeDriveUploader(fake_drive_service.get())); |
64 fake_drive_helper_.reset( | 64 fake_drive_helper_.reset( |
65 new FakeDriveServiceHelper(fake_drive_service.get(), | 65 new FakeDriveServiceHelper(fake_drive_service.get(), |
66 drive_uploader.get(), | 66 drive_uploader.get(), |
67 kSyncRootFolderTitle)); | 67 kSyncRootFolderTitle)); |
68 remote_change_processor_.reset(new FakeRemoteChangeProcessor); | 68 remote_change_processor_.reset(new FakeRemoteChangeProcessor); |
69 | 69 |
70 context_.reset(new SyncEngineContext( | 70 context_.reset(new SyncEngineContext( |
71 fake_drive_service.PassAs<drive::DriveServiceInterface>(), | 71 fake_drive_service.PassAs<drive::DriveServiceInterface>(), |
72 drive_uploader.Pass(), | 72 drive_uploader.Pass(), |
| 73 NULL, |
73 base::MessageLoopProxy::current(), | 74 base::MessageLoopProxy::current(), |
74 base::MessageLoopProxy::current(), | 75 base::MessageLoopProxy::current(), |
75 base::MessageLoopProxy::current())); | 76 base::MessageLoopProxy::current())); |
76 context_->SetRemoteChangeProcessor(remote_change_processor_.get()); | 77 context_->SetRemoteChangeProcessor(remote_change_processor_.get()); |
77 | 78 |
78 RegisterSyncableFileSystem(); | 79 RegisterSyncableFileSystem(); |
79 | 80 |
80 sync_task_manager_.reset(new SyncTaskManager( | 81 sync_task_manager_.reset(new SyncTaskManager( |
81 base::WeakPtr<SyncTaskManager::Client>(), | 82 base::WeakPtr<SyncTaskManager::Client>(), |
82 10 /* maximum_background_task */)); | 83 10 /* maximum_background_task */)); |
(...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
514 | 515 |
515 EXPECT_EQ(4, CountParents(file)); | 516 EXPECT_EQ(4, CountParents(file)); |
516 | 517 |
517 EXPECT_EQ(SYNC_STATUS_OK, RunConflictResolver()); | 518 EXPECT_EQ(SYNC_STATUS_OK, RunConflictResolver()); |
518 | 519 |
519 EXPECT_EQ(1, CountParents(file)); | 520 EXPECT_EQ(1, CountParents(file)); |
520 } | 521 } |
521 | 522 |
522 } // namespace drive_backend | 523 } // namespace drive_backend |
523 } // namespace sync_file_system | 524 } // namespace sync_file_system |
OLD | NEW |