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

Side by Side Diff: chrome/browser/chromeos/fileapi/external_file_url_request_job_unittest.cc

Issue 2318023002: //chrome/browser/chromeos: 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 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/chromeos/fileapi/external_file_url_request_job.h" 5 #include "chrome/browser/chromeos/fileapi/external_file_url_request_job.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <memory> 9 #include <memory>
10 10
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 drive::util::GetDriveMountPointPath(profile).BaseName().AsUTF8Unsafe(); 210 drive::util::GetDriveMountPointPath(profile).BaseName().AsUTF8Unsafe();
211 storage::ExternalMountPoints::GetSystemInstance()->RegisterFileSystem( 211 storage::ExternalMountPoints::GetSystemInstance()->RegisterFileSystem(
212 drive_mount_name, 212 drive_mount_name,
213 storage::kFileSystemTypeDrive, 213 storage::kFileSystemTypeDrive,
214 storage::FileSystemMountOption(), 214 storage::FileSystemMountOption(),
215 drive::util::GetDriveMountPointPath(profile)); 215 drive::util::GetDriveMountPointPath(profile));
216 DCHECK(!fake_file_system_); 216 DCHECK(!fake_file_system_);
217 fake_file_system_ = new drive::test_util::FakeFileSystem(drive_service); 217 fake_file_system_ = new drive::test_util::FakeFileSystem(drive_service);
218 if (!drive_cache_dir_.CreateUniqueTempDir()) 218 if (!drive_cache_dir_.CreateUniqueTempDir())
219 return NULL; 219 return NULL;
220 return new drive::DriveIntegrationService(profile, 220 return new drive::DriveIntegrationService(
221 NULL, 221 profile, NULL, drive_service, drive_mount_name,
achuithb 2016/09/13 20:55:19 make this nullptr
vabr (Chromium) 2016/09/14 10:58:20 Done.
222 drive_service, 222 drive_cache_dir_.GetPath(), fake_file_system_);
223 drive_mount_name,
224 drive_cache_dir_.path(),
225 fake_file_system_);
226 } 223 }
227 224
228 drive::FileSystemInterface* GetFileSystem() { return fake_file_system_; } 225 drive::FileSystemInterface* GetFileSystem() { return fake_file_system_; }
229 226
230 content::TestBrowserThreadBundle thread_bundle_; 227 content::TestBrowserThreadBundle thread_bundle_;
231 drive::DriveIntegrationServiceFactory::FactoryCallback 228 drive::DriveIntegrationServiceFactory::FactoryCallback
232 integration_service_factory_callback_; 229 integration_service_factory_callback_;
233 std::unique_ptr<drive::DriveIntegrationServiceFactory::ScopedFactoryForTest> 230 std::unique_ptr<drive::DriveIntegrationServiceFactory::ScopedFactoryForTest>
234 integration_service_factory_scope_; 231 integration_service_factory_scope_;
235 std::unique_ptr<drive::DriveIntegrationService> integration_service_; 232 std::unique_ptr<drive::DriveIntegrationService> integration_service_;
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
418 "Range", "Wrong Range Header Value", false /* overwrite */); 415 "Range", "Wrong Range Header Value", false /* overwrite */);
419 request->Start(); 416 request->Start();
420 417
421 base::RunLoop().Run(); 418 base::RunLoop().Run();
422 419
423 EXPECT_EQ(net::URLRequestStatus::FAILED, request->status().status()); 420 EXPECT_EQ(net::URLRequestStatus::FAILED, request->status().status());
424 EXPECT_EQ(net::ERR_REQUEST_RANGE_NOT_SATISFIABLE, request->status().error()); 421 EXPECT_EQ(net::ERR_REQUEST_RANGE_NOT_SATISFIABLE, request->status().error());
425 } 422 }
426 423
427 } // namespace chromeos 424 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698