| 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 "components/drive/change_list_loader.h" | 5 #include "components/drive/change_list_loader.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 | 8 |
| 9 #include "base/callback_helpers.h" | 9 #include "base/callback_helpers.h" |
| 10 #include "base/files/scoped_temp_dir.h" | 10 #include "base/files/scoped_temp_dir.h" |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 120 scoped_ptr<google_apis::FileResource> entry; | 120 scoped_ptr<google_apis::FileResource> entry; |
| 121 drive_service_->AddNewFile( | 121 drive_service_->AddNewFile( |
| 122 "text/plain", | 122 "text/plain", |
| 123 "content text", | 123 "content text", |
| 124 drive_service_->GetRootResourceId(), | 124 drive_service_->GetRootResourceId(), |
| 125 title, | 125 title, |
| 126 false, // shared_with_me | 126 false, // shared_with_me |
| 127 google_apis::test_util::CreateCopyResultCallback(&error, &entry)); | 127 google_apis::test_util::CreateCopyResultCallback(&error, &entry)); |
| 128 base::RunLoop().RunUntilIdle(); | 128 base::RunLoop().RunUntilIdle(); |
| 129 EXPECT_EQ(google_apis::HTTP_CREATED, error); | 129 EXPECT_EQ(google_apis::HTTP_CREATED, error); |
| 130 return entry.Pass(); | 130 return entry; |
| 131 } | 131 } |
| 132 | 132 |
| 133 content::TestBrowserThreadBundle thread_bundle_; | 133 content::TestBrowserThreadBundle thread_bundle_; |
| 134 base::ScopedTempDir temp_dir_; | 134 base::ScopedTempDir temp_dir_; |
| 135 scoped_ptr<TestingPrefServiceSimple> pref_service_; | 135 scoped_ptr<TestingPrefServiceSimple> pref_service_; |
| 136 scoped_ptr<EventLogger> logger_; | 136 scoped_ptr<EventLogger> logger_; |
| 137 scoped_ptr<FakeDriveService> drive_service_; | 137 scoped_ptr<FakeDriveService> drive_service_; |
| 138 scoped_ptr<JobScheduler> scheduler_; | 138 scoped_ptr<JobScheduler> scheduler_; |
| 139 scoped_ptr<ResourceMetadataStorage, | 139 scoped_ptr<ResourceMetadataStorage, |
| 140 test_util::DestroyHelperForTests> metadata_storage_; | 140 test_util::DestroyHelperForTests> metadata_storage_; |
| (...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 395 | 395 |
| 396 // Unlock the loader, this should resume the pending update. | 396 // Unlock the loader, this should resume the pending update. |
| 397 lock.reset(); | 397 lock.reset(); |
| 398 base::RunLoop().RunUntilIdle(); | 398 base::RunLoop().RunUntilIdle(); |
| 399 EXPECT_TRUE( | 399 EXPECT_TRUE( |
| 400 observer.changed_files().CountDirectory(util::GetDriveMyDriveRootPath())); | 400 observer.changed_files().CountDirectory(util::GetDriveMyDriveRootPath())); |
| 401 } | 401 } |
| 402 | 402 |
| 403 } // namespace internal | 403 } // namespace internal |
| 404 } // namespace drive | 404 } // namespace drive |
| OLD | NEW |