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/files/file_util.h" | 9 #include "base/files/file_util.h" |
10 #include "base/files/scoped_temp_dir.h" | 10 #include "base/files/scoped_temp_dir.h" |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
64 drive_uploader(new FakeDriveUploader(fake_drive_service.get())); | 64 drive_uploader(new FakeDriveUploader(fake_drive_service.get())); |
65 fake_drive_helper_.reset( | 65 fake_drive_helper_.reset( |
66 new FakeDriveServiceHelper(fake_drive_service.get(), | 66 new FakeDriveServiceHelper(fake_drive_service.get(), |
67 drive_uploader.get(), | 67 drive_uploader.get(), |
68 kSyncRootFolderTitle)); | 68 kSyncRootFolderTitle)); |
69 remote_change_processor_.reset(new FakeRemoteChangeProcessor); | 69 remote_change_processor_.reset(new FakeRemoteChangeProcessor); |
70 | 70 |
71 context_.reset(new SyncEngineContext( | 71 context_.reset(new SyncEngineContext( |
72 fake_drive_service.PassAs<drive::DriveServiceInterface>(), | 72 fake_drive_service.PassAs<drive::DriveServiceInterface>(), |
73 drive_uploader.Pass(), | 73 drive_uploader.Pass(), |
74 NULL, | 74 nullptr, |
75 base::ThreadTaskRunnerHandle::Get(), | 75 base::ThreadTaskRunnerHandle::Get(), |
76 base::ThreadTaskRunnerHandle::Get())); | 76 base::ThreadTaskRunnerHandle::Get())); |
77 context_->SetRemoteChangeProcessor(remote_change_processor_.get()); | 77 context_->SetRemoteChangeProcessor(remote_change_processor_.get()); |
78 | 78 |
79 RegisterSyncableFileSystem(); | 79 RegisterSyncableFileSystem(); |
80 | 80 |
81 sync_task_manager_.reset(new SyncTaskManager( | 81 sync_task_manager_.reset(new SyncTaskManager( |
82 base::WeakPtr<SyncTaskManager::Client>(), | 82 base::WeakPtr<SyncTaskManager::Client>(), |
83 10 /* maximum_background_task */, | 83 10 /* maximum_background_task */, |
84 base::ThreadTaskRunnerHandle::Get())); | 84 base::ThreadTaskRunnerHandle::Get())); |
(...skipping 433 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
518 | 518 |
519 EXPECT_EQ(4, CountParents(file)); | 519 EXPECT_EQ(4, CountParents(file)); |
520 | 520 |
521 EXPECT_EQ(SYNC_STATUS_OK, RunConflictResolver()); | 521 EXPECT_EQ(SYNC_STATUS_OK, RunConflictResolver()); |
522 | 522 |
523 EXPECT_EQ(1, CountParents(file)); | 523 EXPECT_EQ(1, CountParents(file)); |
524 } | 524 } |
525 | 525 |
526 } // namespace drive_backend | 526 } // namespace drive_backend |
527 } // namespace sync_file_system | 527 } // namespace sync_file_system |
OLD | NEW |