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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
47 } // namespace | 47 } // namespace |
48 | 48 |
49 class ConflictResolverTest : public testing::Test { | 49 class ConflictResolverTest : public testing::Test { |
50 public: | 50 public: |
51 typedef FakeRemoteChangeProcessor::URLToFileChangesMap URLToFileChangesMap; | 51 typedef FakeRemoteChangeProcessor::URLToFileChangesMap URLToFileChangesMap; |
52 | 52 |
53 ConflictResolverTest() | 53 ConflictResolverTest() |
54 : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP) {} | 54 : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP) {} |
55 virtual ~ConflictResolverTest() {} | 55 virtual ~ConflictResolverTest() {} |
56 | 56 |
57 virtual void SetUp() OVERRIDE { | 57 virtual void SetUp() override { |
58 ASSERT_TRUE(database_dir_.CreateUniqueTempDir()); | 58 ASSERT_TRUE(database_dir_.CreateUniqueTempDir()); |
59 in_memory_env_.reset(leveldb::NewMemEnv(leveldb::Env::Default())); | 59 in_memory_env_.reset(leveldb::NewMemEnv(leveldb::Env::Default())); |
60 | 60 |
61 scoped_ptr<FakeDriveServiceWrapper> | 61 scoped_ptr<FakeDriveServiceWrapper> |
62 fake_drive_service(new FakeDriveServiceWrapper); | 62 fake_drive_service(new FakeDriveServiceWrapper); |
63 scoped_ptr<drive::DriveUploaderInterface> | 63 scoped_ptr<drive::DriveUploaderInterface> |
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(), |
(...skipping 10 matching lines...) Expand all Loading... |
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())); |
85 sync_task_manager_->Initialize(SYNC_STATUS_OK); | 85 sync_task_manager_->Initialize(SYNC_STATUS_OK); |
86 } | 86 } |
87 | 87 |
88 virtual void TearDown() OVERRIDE { | 88 virtual void TearDown() override { |
89 sync_task_manager_.reset(); | 89 sync_task_manager_.reset(); |
90 RevokeSyncableFileSystem(); | 90 RevokeSyncableFileSystem(); |
91 fake_drive_helper_.reset(); | 91 fake_drive_helper_.reset(); |
92 context_.reset(); | 92 context_.reset(); |
93 base::RunLoop().RunUntilIdle(); | 93 base::RunLoop().RunUntilIdle(); |
94 } | 94 } |
95 | 95 |
96 void InitializeMetadataDatabase() { | 96 void InitializeMetadataDatabase() { |
97 SyncEngineInitializer* initializer = | 97 SyncEngineInitializer* initializer = |
98 new SyncEngineInitializer(context_.get(), | 98 new SyncEngineInitializer(context_.get(), |
(...skipping 419 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 |