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 <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/callback.h" | 10 #include "base/callback.h" |
11 #include "base/files/file_util.h" | 11 #include "base/files/file_util.h" |
12 #include "base/files/scoped_temp_dir.h" | 12 #include "base/files/scoped_temp_dir.h" |
13 #include "base/macros.h" | 13 #include "base/macros.h" |
14 #include "base/run_loop.h" | 14 #include "base/run_loop.h" |
15 #include "base/thread_task_runner_handle.h" | 15 #include "base/threading/thread_task_runner_handle.h" |
16 #include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants.
h" | 16 #include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants.
h" |
17 #include "chrome/browser/sync_file_system/drive_backend/drive_backend_test_util.
h" | 17 #include "chrome/browser/sync_file_system/drive_backend/drive_backend_test_util.
h" |
18 #include "chrome/browser/sync_file_system/drive_backend/fake_drive_service_helpe
r.h" | 18 #include "chrome/browser/sync_file_system/drive_backend/fake_drive_service_helpe
r.h" |
19 #include "chrome/browser/sync_file_system/drive_backend/fake_drive_uploader.h" | 19 #include "chrome/browser/sync_file_system/drive_backend/fake_drive_uploader.h" |
20 #include "chrome/browser/sync_file_system/drive_backend/list_changes_task.h" | 20 #include "chrome/browser/sync_file_system/drive_backend/list_changes_task.h" |
21 #include "chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.h
" | 21 #include "chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.h
" |
22 #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h" | 22 #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h" |
23 #include "chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer.h
" | 23 #include "chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer.h
" |
24 #include "chrome/browser/sync_file_system/drive_backend/sync_engine_context.h" | 24 #include "chrome/browser/sync_file_system/drive_backend/sync_engine_context.h" |
25 #include "chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.
h" | 25 #include "chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.
h" |
(...skipping 492 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 |