| 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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 ASSERT_TRUE(database_dir_.CreateUniqueTempDir()); | 54 ASSERT_TRUE(database_dir_.CreateUniqueTempDir()); |
| 55 | 55 |
| 56 fake_drive_service_.reset(new FakeDriveServiceWrapper); | 56 fake_drive_service_.reset(new FakeDriveServiceWrapper); |
| 57 ASSERT_TRUE(fake_drive_service_->LoadAccountMetadataForWapi( | 57 ASSERT_TRUE(fake_drive_service_->LoadAccountMetadataForWapi( |
| 58 "sync_file_system/account_metadata.json")); | 58 "sync_file_system/account_metadata.json")); |
| 59 ASSERT_TRUE(fake_drive_service_->LoadResourceListForWapi( | 59 ASSERT_TRUE(fake_drive_service_->LoadResourceListForWapi( |
| 60 "gdata/empty_feed.json")); | 60 "gdata/empty_feed.json")); |
| 61 | 61 |
| 62 drive_uploader_.reset(new FakeDriveUploader(fake_drive_service_.get())); | 62 drive_uploader_.reset(new FakeDriveUploader(fake_drive_service_.get())); |
| 63 fake_drive_helper_.reset(new FakeDriveServiceHelper( | 63 fake_drive_helper_.reset(new FakeDriveServiceHelper( |
| 64 fake_drive_service_.get(), drive_uploader_.get())); | 64 fake_drive_service_.get(), drive_uploader_.get(), |
| 65 kSyncRootFolderTitle)); |
| 65 fake_remote_change_processor_.reset(new FakeRemoteChangeProcessor); | 66 fake_remote_change_processor_.reset(new FakeRemoteChangeProcessor); |
| 66 | 67 |
| 67 RegisterSyncableFileSystem(); | 68 RegisterSyncableFileSystem(); |
| 68 } | 69 } |
| 69 | 70 |
| 70 virtual void TearDown() OVERRIDE { | 71 virtual void TearDown() OVERRIDE { |
| 71 RevokeSyncableFileSystem(); | 72 RevokeSyncableFileSystem(); |
| 72 | 73 |
| 73 fake_remote_change_processor_.reset(); | 74 fake_remote_change_processor_.reset(); |
| 74 metadata_database_.reset(); | 75 metadata_database_.reset(); |
| (...skipping 427 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 502 | 503 |
| 503 EXPECT_EQ(4, CountParents(file)); | 504 EXPECT_EQ(4, CountParents(file)); |
| 504 | 505 |
| 505 EXPECT_EQ(SYNC_STATUS_OK, RunConflictResolver()); | 506 EXPECT_EQ(SYNC_STATUS_OK, RunConflictResolver()); |
| 506 | 507 |
| 507 EXPECT_EQ(1, CountParents(file)); | 508 EXPECT_EQ(1, CountParents(file)); |
| 508 } | 509 } |
| 509 | 510 |
| 510 } // namespace drive_backend | 511 } // namespace drive_backend |
| 511 } // namespace sync_file_system | 512 } // namespace sync_file_system |
| OLD | NEW |