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/register_app_task.h" | 5 #include "chrome/browser/sync_file_system/drive_backend/register_app_task.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/files/scoped_temp_dir.h" | 9 #include "base/files/scoped_temp_dir.h" |
10 #include "base/format_macros.h" | 10 #include "base/format_macros.h" |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
53 drive_uploader(new drive::DriveUploader( | 53 drive_uploader(new drive::DriveUploader( |
54 fake_drive_service.get(), | 54 fake_drive_service.get(), |
55 base::ThreadTaskRunnerHandle::Get())); | 55 base::ThreadTaskRunnerHandle::Get())); |
56 | 56 |
57 fake_drive_service_helper_.reset(new FakeDriveServiceHelper( | 57 fake_drive_service_helper_.reset(new FakeDriveServiceHelper( |
58 fake_drive_service.get(), drive_uploader.get(), | 58 fake_drive_service.get(), drive_uploader.get(), |
59 kSyncRootFolderTitle)); | 59 kSyncRootFolderTitle)); |
60 | 60 |
61 context_.reset(new SyncEngineContext(fake_drive_service.Pass(), | 61 context_.reset(new SyncEngineContext(fake_drive_service.Pass(), |
62 drive_uploader.Pass(), | 62 drive_uploader.Pass(), |
63 nullptr, | 63 nullptr /* task_logger */, |
64 base::ThreadTaskRunnerHandle::Get(), | 64 base::ThreadTaskRunnerHandle::Get(), |
65 base::ThreadTaskRunnerHandle::Get())); | 65 base::ThreadTaskRunnerHandle::Get(), |
| 66 nullptr /* worker_pool */)); |
66 | 67 |
67 ASSERT_EQ(google_apis::HTTP_CREATED, | 68 ASSERT_EQ(google_apis::HTTP_CREATED, |
68 fake_drive_service_helper_->AddOrphanedFolder( | 69 fake_drive_service_helper_->AddOrphanedFolder( |
69 kSyncRootFolderTitle, &sync_root_folder_id_)); | 70 kSyncRootFolderTitle, &sync_root_folder_id_)); |
70 } | 71 } |
71 | 72 |
72 void TearDown() override { | 73 void TearDown() override { |
73 context_.reset(); | 74 context_.reset(); |
74 base::RunLoop().RunUntilIdle(); | 75 base::RunLoop().RunUntilIdle(); |
75 } | 76 } |
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
304 | 305 |
305 CreateMetadataDatabase(db.Pass()); | 306 CreateMetadataDatabase(db.Pass()); |
306 RunRegisterAppTask(kAppID); | 307 RunRegisterAppTask(kAppID); |
307 | 308 |
308 EXPECT_EQ(1u, CountRegisteredAppRoot()); | 309 EXPECT_EQ(1u, CountRegisteredAppRoot()); |
309 EXPECT_TRUE(IsAppRegistered(kAppID)); | 310 EXPECT_TRUE(IsAppRegistered(kAppID)); |
310 } | 311 } |
311 | 312 |
312 } // namespace drive_backend | 313 } // namespace drive_backend |
313 } // namespace sync_file_system | 314 } // namespace sync_file_system |
OLD | NEW |