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" |
| 11 #include "base/macros.h" |
11 #include "base/run_loop.h" | 12 #include "base/run_loop.h" |
12 #include "base/thread_task_runner_handle.h" | 13 #include "base/thread_task_runner_handle.h" |
13 #include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants.
h" | 14 #include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants.
h" |
14 #include "chrome/browser/sync_file_system/drive_backend/drive_backend_test_util.
h" | 15 #include "chrome/browser/sync_file_system/drive_backend/drive_backend_test_util.
h" |
15 #include "chrome/browser/sync_file_system/drive_backend/fake_drive_service_helpe
r.h" | 16 #include "chrome/browser/sync_file_system/drive_backend/fake_drive_service_helpe
r.h" |
16 #include "chrome/browser/sync_file_system/drive_backend/fake_drive_uploader.h" | 17 #include "chrome/browser/sync_file_system/drive_backend/fake_drive_uploader.h" |
17 #include "chrome/browser/sync_file_system/drive_backend/list_changes_task.h" | 18 #include "chrome/browser/sync_file_system/drive_backend/list_changes_task.h" |
18 #include "chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.h
" | 19 #include "chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.h
" |
19 #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h" | 20 #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h" |
20 #include "chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer.h
" | 21 #include "chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer.h
" |
(...skipping 498 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
519 | 520 |
520 EXPECT_EQ(4, CountParents(file)); | 521 EXPECT_EQ(4, CountParents(file)); |
521 | 522 |
522 EXPECT_EQ(SYNC_STATUS_OK, RunConflictResolver()); | 523 EXPECT_EQ(SYNC_STATUS_OK, RunConflictResolver()); |
523 | 524 |
524 EXPECT_EQ(1, CountParents(file)); | 525 EXPECT_EQ(1, CountParents(file)); |
525 } | 526 } |
526 | 527 |
527 } // namespace drive_backend | 528 } // namespace drive_backend |
528 } // namespace sync_file_system | 529 } // namespace sync_file_system |
OLD | NEW |