OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/chromeos/drive/directory_loader.h" | 5 #include "chrome/browser/chromeos/drive/directory_loader.h" |
6 | 6 |
7 #include "base/callback_helpers.h" | 7 #include "base/callback_helpers.h" |
8 #include "base/files/scoped_temp_dir.h" | 8 #include "base/files/scoped_temp_dir.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "base/prefs/testing_pref_service.h" | 10 #include "base/prefs/testing_pref_service.h" |
11 #include "base/run_loop.h" | 11 #include "base/run_loop.h" |
| 12 #include "base/single_thread_task_runner.h" |
| 13 #include "base/thread_task_runner_handle.h" |
12 #include "chrome/browser/chromeos/drive/change_list_loader.h" | 14 #include "chrome/browser/chromeos/drive/change_list_loader.h" |
13 #include "chrome/browser/chromeos/drive/change_list_loader_observer.h" | 15 #include "chrome/browser/chromeos/drive/change_list_loader_observer.h" |
14 #include "chrome/browser/chromeos/drive/file_cache.h" | 16 #include "chrome/browser/chromeos/drive/file_cache.h" |
15 #include "chrome/browser/chromeos/drive/file_system_util.h" | 17 #include "chrome/browser/chromeos/drive/file_system_util.h" |
16 #include "chrome/browser/chromeos/drive/job_scheduler.h" | 18 #include "chrome/browser/chromeos/drive/job_scheduler.h" |
17 #include "chrome/browser/chromeos/drive/resource_metadata.h" | 19 #include "chrome/browser/chromeos/drive/resource_metadata.h" |
18 #include "chrome/browser/chromeos/drive/test_util.h" | 20 #include "chrome/browser/chromeos/drive/test_util.h" |
19 #include "chrome/browser/drive/event_logger.h" | 21 #include "chrome/browser/drive/event_logger.h" |
20 #include "chrome/browser/drive/fake_drive_service.h" | 22 #include "chrome/browser/drive/fake_drive_service.h" |
21 #include "chrome/browser/drive/test_util.h" | 23 #include "chrome/browser/drive/test_util.h" |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
68 void SetUp() override { | 70 void SetUp() override { |
69 ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); | 71 ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); |
70 pref_service_.reset(new TestingPrefServiceSimple); | 72 pref_service_.reset(new TestingPrefServiceSimple); |
71 test_util::RegisterDrivePrefs(pref_service_->registry()); | 73 test_util::RegisterDrivePrefs(pref_service_->registry()); |
72 | 74 |
73 logger_.reset(new EventLogger); | 75 logger_.reset(new EventLogger); |
74 | 76 |
75 drive_service_.reset(new FakeDriveService); | 77 drive_service_.reset(new FakeDriveService); |
76 ASSERT_TRUE(test_util::SetUpTestEntries(drive_service_.get())); | 78 ASSERT_TRUE(test_util::SetUpTestEntries(drive_service_.get())); |
77 | 79 |
78 scheduler_.reset(new JobScheduler(pref_service_.get(), | 80 scheduler_.reset(new JobScheduler(pref_service_.get(), logger_.get(), |
79 logger_.get(), | |
80 drive_service_.get(), | 81 drive_service_.get(), |
81 base::MessageLoopProxy::current().get())); | 82 base::ThreadTaskRunnerHandle::Get())); |
82 metadata_storage_.reset(new ResourceMetadataStorage( | 83 metadata_storage_.reset(new ResourceMetadataStorage( |
83 temp_dir_.path(), base::MessageLoopProxy::current().get())); | 84 temp_dir_.path(), base::ThreadTaskRunnerHandle::Get())); |
84 ASSERT_TRUE(metadata_storage_->Initialize()); | 85 ASSERT_TRUE(metadata_storage_->Initialize()); |
85 | 86 |
86 cache_.reset(new FileCache(metadata_storage_.get(), | 87 cache_.reset(new FileCache(metadata_storage_.get(), temp_dir_.path(), |
87 temp_dir_.path(), | 88 base::ThreadTaskRunnerHandle::Get(), |
88 base::MessageLoopProxy::current().get(), | |
89 NULL /* free_disk_space_getter */)); | 89 NULL /* free_disk_space_getter */)); |
90 ASSERT_TRUE(cache_->Initialize()); | 90 ASSERT_TRUE(cache_->Initialize()); |
91 | 91 |
92 metadata_.reset(new ResourceMetadata( | 92 metadata_.reset(new ResourceMetadata(metadata_storage_.get(), cache_.get(), |
93 metadata_storage_.get(), cache_.get(), | 93 base::ThreadTaskRunnerHandle::Get())); |
94 base::MessageLoopProxy::current().get())); | |
95 ASSERT_EQ(FILE_ERROR_OK, metadata_->Initialize()); | 94 ASSERT_EQ(FILE_ERROR_OK, metadata_->Initialize()); |
96 | 95 |
97 about_resource_loader_.reset(new AboutResourceLoader(scheduler_.get())); | 96 about_resource_loader_.reset(new AboutResourceLoader(scheduler_.get())); |
98 loader_controller_.reset(new LoaderController); | 97 loader_controller_.reset(new LoaderController); |
99 directory_loader_.reset( | 98 directory_loader_.reset(new DirectoryLoader( |
100 new DirectoryLoader(logger_.get(), | 99 logger_.get(), base::ThreadTaskRunnerHandle::Get(), metadata_.get(), |
101 base::MessageLoopProxy::current().get(), | 100 scheduler_.get(), about_resource_loader_.get(), |
102 metadata_.get(), | 101 loader_controller_.get())); |
103 scheduler_.get(), | |
104 about_resource_loader_.get(), | |
105 loader_controller_.get())); | |
106 } | 102 } |
107 | 103 |
108 // Adds a new file to the root directory of the service. | 104 // Adds a new file to the root directory of the service. |
109 scoped_ptr<google_apis::FileResource> AddNewFile(const std::string& title) { | 105 scoped_ptr<google_apis::FileResource> AddNewFile(const std::string& title) { |
110 google_apis::DriveApiErrorCode error = google_apis::DRIVE_FILE_ERROR; | 106 google_apis::DriveApiErrorCode error = google_apis::DRIVE_FILE_ERROR; |
111 scoped_ptr<google_apis::FileResource> entry; | 107 scoped_ptr<google_apis::FileResource> entry; |
112 drive_service_->AddNewFile( | 108 drive_service_->AddNewFile( |
113 "text/plain", | 109 "text/plain", |
114 "content text", | 110 "content text", |
115 drive_service_->GetRootResourceId(), | 111 drive_service_->GetRootResourceId(), |
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
240 | 236 |
241 // Unlock the loader, this should resume the pending udpate. | 237 // Unlock the loader, this should resume the pending udpate. |
242 lock.reset(); | 238 lock.reset(); |
243 base::RunLoop().RunUntilIdle(); | 239 base::RunLoop().RunUntilIdle(); |
244 EXPECT_EQ(1U, observer.changed_directories().count( | 240 EXPECT_EQ(1U, observer.changed_directories().count( |
245 util::GetDriveMyDriveRootPath())); | 241 util::GetDriveMyDriveRootPath())); |
246 } | 242 } |
247 | 243 |
248 } // namespace internal | 244 } // namespace internal |
249 } // namespace drive | 245 } // namespace drive |
OLD | NEW |