Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(48)

Side by Side Diff: components/drive/sync_client_unittest.cc

Issue 2317993003: //chrome/browser and //components A-E: Change ScopedTempDir::path() to GetPath() (Closed)
Patch Set: Just rebased Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/chromeos/sync_client.h" 5 #include "components/drive/chromeos/sync_client.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/files/file_util.h" 10 #include "base/files/file_util.h"
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 116
117 drive_service_.reset(new SyncClientTestDriveService); 117 drive_service_.reset(new SyncClientTestDriveService);
118 118
119 scheduler_.reset(new JobScheduler( 119 scheduler_.reset(new JobScheduler(
120 pref_service_.get(), 120 pref_service_.get(),
121 logger_.get(), 121 logger_.get(),
122 drive_service_.get(), 122 drive_service_.get(),
123 base::ThreadTaskRunnerHandle::Get().get())); 123 base::ThreadTaskRunnerHandle::Get().get()));
124 124
125 metadata_storage_.reset(new ResourceMetadataStorage( 125 metadata_storage_.reset(new ResourceMetadataStorage(
126 temp_dir_.path(), base::ThreadTaskRunnerHandle::Get().get())); 126 temp_dir_.GetPath(), base::ThreadTaskRunnerHandle::Get().get()));
127 ASSERT_TRUE(metadata_storage_->Initialize()); 127 ASSERT_TRUE(metadata_storage_->Initialize());
128 128
129 cache_.reset(new FileCache(metadata_storage_.get(), 129 cache_.reset(new FileCache(metadata_storage_.get(), temp_dir_.GetPath(),
130 temp_dir_.path(),
131 base::ThreadTaskRunnerHandle::Get().get(), 130 base::ThreadTaskRunnerHandle::Get().get(),
132 NULL /* free_disk_space_getter */)); 131 NULL /* free_disk_space_getter */));
133 ASSERT_TRUE(cache_->Initialize()); 132 ASSERT_TRUE(cache_->Initialize());
134 133
135 metadata_.reset(new internal::ResourceMetadata( 134 metadata_.reset(new internal::ResourceMetadata(
136 metadata_storage_.get(), cache_.get(), 135 metadata_storage_.get(), cache_.get(),
137 base::ThreadTaskRunnerHandle::Get())); 136 base::ThreadTaskRunnerHandle::Get()));
138 ASSERT_EQ(FILE_ERROR_OK, metadata_->Initialize()); 137 ASSERT_EQ(FILE_ERROR_OK, metadata_->Initialize());
139 138
140 about_resource_loader_.reset(new AboutResourceLoader(scheduler_.get())); 139 about_resource_loader_.reset(new AboutResourceLoader(scheduler_.get()));
141 loader_controller_.reset(new LoaderController); 140 loader_controller_.reset(new LoaderController);
142 change_list_loader_.reset(new ChangeListLoader( 141 change_list_loader_.reset(new ChangeListLoader(
143 logger_.get(), 142 logger_.get(),
144 base::ThreadTaskRunnerHandle::Get().get(), 143 base::ThreadTaskRunnerHandle::Get().get(),
145 metadata_.get(), 144 metadata_.get(),
146 scheduler_.get(), 145 scheduler_.get(),
147 about_resource_loader_.get(), 146 about_resource_loader_.get(),
148 loader_controller_.get())); 147 loader_controller_.get()));
149 ASSERT_NO_FATAL_FAILURE(SetUpTestData()); 148 ASSERT_NO_FATAL_FAILURE(SetUpTestData());
150 149
151 sync_client_.reset(new SyncClient(base::ThreadTaskRunnerHandle::Get().get(), 150 sync_client_.reset(
152 &delegate_, 151 new SyncClient(base::ThreadTaskRunnerHandle::Get().get(), &delegate_,
153 scheduler_.get(), 152 scheduler_.get(), metadata_.get(), cache_.get(),
154 metadata_.get(), 153 loader_controller_.get(), temp_dir_.GetPath()));
155 cache_.get(),
156 loader_controller_.get(),
157 temp_dir_.path()));
158 154
159 // Disable delaying so that DoSyncLoop() starts immediately. 155 // Disable delaying so that DoSyncLoop() starts immediately.
160 sync_client_->set_delay_for_testing(base::TimeDelta::FromSeconds(0)); 156 sync_client_->set_delay_for_testing(base::TimeDelta::FromSeconds(0));
161 } 157 }
162 158
163 // Adds a file to the service root and |resource_ids_|. 159 // Adds a file to the service root and |resource_ids_|.
164 void AddFileEntry(const std::string& title) { 160 void AddFileEntry(const std::string& title) {
165 google_apis::DriveApiErrorCode error = google_apis::DRIVE_FILE_ERROR; 161 google_apis::DriveApiErrorCode error = google_apis::DRIVE_FILE_ERROR;
166 std::unique_ptr<google_apis::FileResource> entry; 162 std::unique_ptr<google_apis::FileResource> entry;
167 drive_service_->AddNewFile( 163 drive_service_->AddNewFile(
168 "text/plain", 164 "text/plain",
169 kRemoteContent, 165 kRemoteContent,
170 drive_service_->GetRootResourceId(), 166 drive_service_->GetRootResourceId(),
171 title, 167 title,
172 false, // shared_with_me 168 false, // shared_with_me
173 google_apis::test_util::CreateCopyResultCallback(&error, &entry)); 169 google_apis::test_util::CreateCopyResultCallback(&error, &entry));
174 base::RunLoop().RunUntilIdle(); 170 base::RunLoop().RunUntilIdle();
175 ASSERT_EQ(google_apis::HTTP_CREATED, error); 171 ASSERT_EQ(google_apis::HTTP_CREATED, error);
176 ASSERT_TRUE(entry); 172 ASSERT_TRUE(entry);
177 resource_ids_[title] = entry->file_id(); 173 resource_ids_[title] = entry->file_id();
178 } 174 }
179 175
180 // Sets up data for tests. 176 // Sets up data for tests.
181 void SetUpTestData() { 177 void SetUpTestData() {
182 // Prepare a temp file. 178 // Prepare a temp file.
183 base::FilePath temp_file; 179 base::FilePath temp_file;
184 EXPECT_TRUE(base::CreateTemporaryFileInDir(temp_dir_.path(), &temp_file)); 180 EXPECT_TRUE(
181 base::CreateTemporaryFileInDir(temp_dir_.GetPath(), &temp_file));
185 ASSERT_TRUE(google_apis::test_util::WriteStringToFile(temp_file, 182 ASSERT_TRUE(google_apis::test_util::WriteStringToFile(temp_file,
186 kLocalContent)); 183 kLocalContent));
187 184
188 // Add file entries to the service. 185 // Add file entries to the service.
189 ASSERT_NO_FATAL_FAILURE(AddFileEntry("foo")); 186 ASSERT_NO_FATAL_FAILURE(AddFileEntry("foo"));
190 ASSERT_NO_FATAL_FAILURE(AddFileEntry("bar")); 187 ASSERT_NO_FATAL_FAILURE(AddFileEntry("bar"));
191 ASSERT_NO_FATAL_FAILURE(AddFileEntry("baz")); 188 ASSERT_NO_FATAL_FAILURE(AddFileEntry("baz"));
192 ASSERT_NO_FATAL_FAILURE(AddFileEntry("fetched")); 189 ASSERT_NO_FATAL_FAILURE(AddFileEntry("fetched"));
193 ASSERT_NO_FATAL_FAILURE(AddFileEntry("dirty")); 190 ASSERT_NO_FATAL_FAILURE(AddFileEntry("dirty"));
194 ASSERT_NO_FATAL_FAILURE(AddFileEntry("removed")); 191 ASSERT_NO_FATAL_FAILURE(AddFileEntry("removed"));
(...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after
515 local_id, google_apis::test_util::CreateCopyResultCallback(&error))); 512 local_id, google_apis::test_util::CreateCopyResultCallback(&error)));
516 513
517 base::RunLoop().RunUntilIdle(); 514 base::RunLoop().RunUntilIdle();
518 515
519 // The callback is called. 516 // The callback is called.
520 EXPECT_EQ(FILE_ERROR_OK, error); 517 EXPECT_EQ(FILE_ERROR_OK, error);
521 } 518 }
522 519
523 } // namespace internal 520 } // namespace internal
524 } // namespace drive 521 } // namespace drive
OLDNEW
« no previous file with comments | « components/drive/service/fake_drive_service_unittest.cc ('k') | components/exo/wayland/server_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698