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( |
79 logger_.get(), | 81 pref_service_.get(), |
hashimoto
2015/05/13 15:38:13
This looks still weird.
How did you run "git cl f
Pranay
2015/05/14 04:42:00
Since git cl format was interfering with the verti
| |
80 drive_service_.get(), | 82 logger_.get(), |
81 base::MessageLoopProxy::current().get())); | 83 drive_service_.get(), |
84 base::ThreadTaskRunnerHandle::Get().get())); | |
82 metadata_storage_.reset(new ResourceMetadataStorage( | 85 metadata_storage_.reset(new ResourceMetadataStorage( |
83 temp_dir_.path(), base::MessageLoopProxy::current().get())); | 86 temp_dir_.path(), base::ThreadTaskRunnerHandle::Get().get())); |
84 ASSERT_TRUE(metadata_storage_->Initialize()); | 87 ASSERT_TRUE(metadata_storage_->Initialize()); |
85 | 88 |
86 cache_.reset(new FileCache(metadata_storage_.get(), | 89 cache_.reset(new FileCache(metadata_storage_.get(), |
87 temp_dir_.path(), | 90 temp_dir_.path(), |
88 base::MessageLoopProxy::current().get(), | 91 base::ThreadTaskRunnerHandle::Get().get(), |
89 NULL /* free_disk_space_getter */)); | 92 NULL /* free_disk_space_getter */)); |
90 ASSERT_TRUE(cache_->Initialize()); | 93 ASSERT_TRUE(cache_->Initialize()); |
91 | 94 |
92 metadata_.reset(new ResourceMetadata( | 95 metadata_.reset(new ResourceMetadata( |
93 metadata_storage_.get(), cache_.get(), | 96 metadata_storage_.get(), cache_.get(), |
94 base::MessageLoopProxy::current().get())); | 97 base::ThreadTaskRunnerHandle::Get().get())); |
95 ASSERT_EQ(FILE_ERROR_OK, metadata_->Initialize()); | 98 ASSERT_EQ(FILE_ERROR_OK, metadata_->Initialize()); |
96 | 99 |
97 about_resource_loader_.reset(new AboutResourceLoader(scheduler_.get())); | 100 about_resource_loader_.reset(new AboutResourceLoader(scheduler_.get())); |
98 loader_controller_.reset(new LoaderController); | 101 loader_controller_.reset(new LoaderController); |
99 directory_loader_.reset( | 102 directory_loader_.reset( |
100 new DirectoryLoader(logger_.get(), | 103 new DirectoryLoader(logger_.get(), |
101 base::MessageLoopProxy::current().get(), | 104 base::ThreadTaskRunnerHandle::Get().get(), |
102 metadata_.get(), | 105 metadata_.get(), |
103 scheduler_.get(), | 106 scheduler_.get(), |
104 about_resource_loader_.get(), | 107 about_resource_loader_.get(), |
105 loader_controller_.get())); | 108 loader_controller_.get())); |
106 } | 109 } |
107 | 110 |
108 // Adds a new file to the root directory of the service. | 111 // Adds a new file to the root directory of the service. |
109 scoped_ptr<google_apis::FileResource> AddNewFile(const std::string& title) { | 112 scoped_ptr<google_apis::FileResource> AddNewFile(const std::string& title) { |
110 google_apis::DriveApiErrorCode error = google_apis::DRIVE_FILE_ERROR; | 113 google_apis::DriveApiErrorCode error = google_apis::DRIVE_FILE_ERROR; |
111 scoped_ptr<google_apis::FileResource> entry; | 114 scoped_ptr<google_apis::FileResource> entry; |
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
240 | 243 |
241 // Unlock the loader, this should resume the pending udpate. | 244 // Unlock the loader, this should resume the pending udpate. |
242 lock.reset(); | 245 lock.reset(); |
243 base::RunLoop().RunUntilIdle(); | 246 base::RunLoop().RunUntilIdle(); |
244 EXPECT_EQ(1U, observer.changed_directories().count( | 247 EXPECT_EQ(1U, observer.changed_directories().count( |
245 util::GetDriveMyDriveRootPath())); | 248 util::GetDriveMyDriveRootPath())); |
246 } | 249 } |
247 | 250 |
248 } // namespace internal | 251 } // namespace internal |
249 } // namespace drive | 252 } // namespace drive |
OLD | NEW |