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

Side by Side Diff: components/drive/change_list_loader_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 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/chromeos/change_list_loader.h" 5 #include "components/drive/chromeos/change_list_loader.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <memory> 9 #include <memory>
10 10
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 83
84 drive_service_.reset(new FakeDriveService); 84 drive_service_.reset(new FakeDriveService);
85 ASSERT_TRUE(test_util::SetUpTestEntries(drive_service_.get())); 85 ASSERT_TRUE(test_util::SetUpTestEntries(drive_service_.get()));
86 86
87 scheduler_.reset(new JobScheduler( 87 scheduler_.reset(new JobScheduler(
88 pref_service_.get(), 88 pref_service_.get(),
89 logger_.get(), 89 logger_.get(),
90 drive_service_.get(), 90 drive_service_.get(),
91 base::ThreadTaskRunnerHandle::Get().get())); 91 base::ThreadTaskRunnerHandle::Get().get()));
92 metadata_storage_.reset(new ResourceMetadataStorage( 92 metadata_storage_.reset(new ResourceMetadataStorage(
93 temp_dir_.path(), base::ThreadTaskRunnerHandle::Get().get())); 93 temp_dir_.GetPath(), base::ThreadTaskRunnerHandle::Get().get()));
94 ASSERT_TRUE(metadata_storage_->Initialize()); 94 ASSERT_TRUE(metadata_storage_->Initialize());
95 95
96 cache_.reset(new FileCache(metadata_storage_.get(), 96 cache_.reset(new FileCache(metadata_storage_.get(), temp_dir_.GetPath(),
97 temp_dir_.path(),
98 base::ThreadTaskRunnerHandle::Get().get(), 97 base::ThreadTaskRunnerHandle::Get().get(),
99 NULL /* free_disk_space_getter */)); 98 NULL /* free_disk_space_getter */));
100 ASSERT_TRUE(cache_->Initialize()); 99 ASSERT_TRUE(cache_->Initialize());
101 100
102 metadata_.reset(new ResourceMetadata( 101 metadata_.reset(new ResourceMetadata(
103 metadata_storage_.get(), cache_.get(), 102 metadata_storage_.get(), cache_.get(),
104 base::ThreadTaskRunnerHandle::Get().get())); 103 base::ThreadTaskRunnerHandle::Get().get()));
105 ASSERT_EQ(FILE_ERROR_OK, metadata_->Initialize()); 104 ASSERT_EQ(FILE_ERROR_OK, metadata_->Initialize());
106 105
107 about_resource_loader_.reset(new AboutResourceLoader(scheduler_.get())); 106 about_resource_loader_.reset(new AboutResourceLoader(scheduler_.get()));
(...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after
400 399
401 // Unlock the loader, this should resume the pending update. 400 // Unlock the loader, this should resume the pending update.
402 lock.reset(); 401 lock.reset();
403 base::RunLoop().RunUntilIdle(); 402 base::RunLoop().RunUntilIdle();
404 EXPECT_TRUE( 403 EXPECT_TRUE(
405 observer.changed_files().CountDirectory(util::GetDriveMyDriveRootPath())); 404 observer.changed_files().CountDirectory(util::GetDriveMyDriveRootPath()));
406 } 405 }
407 406
408 } // namespace internal 407 } // namespace internal
409 } // namespace drive 408 } // namespace drive
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698