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

Side by Side Diff: components/drive/directory_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 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 "components/drive/chromeos/directory_loader.h" 5 #include "components/drive/chromeos/directory_loader.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/callback_helpers.h" 9 #include "base/callback_helpers.h"
10 #include "base/files/scoped_temp_dir.h" 10 #include "base/files/scoped_temp_dir.h"
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 79
80 drive_service_.reset(new FakeDriveService); 80 drive_service_.reset(new FakeDriveService);
81 ASSERT_TRUE(test_util::SetUpTestEntries(drive_service_.get())); 81 ASSERT_TRUE(test_util::SetUpTestEntries(drive_service_.get()));
82 82
83 scheduler_.reset(new JobScheduler( 83 scheduler_.reset(new JobScheduler(
84 pref_service_.get(), 84 pref_service_.get(),
85 logger_.get(), 85 logger_.get(),
86 drive_service_.get(), 86 drive_service_.get(),
87 base::ThreadTaskRunnerHandle::Get().get())); 87 base::ThreadTaskRunnerHandle::Get().get()));
88 metadata_storage_.reset(new ResourceMetadataStorage( 88 metadata_storage_.reset(new ResourceMetadataStorage(
89 temp_dir_.path(), base::ThreadTaskRunnerHandle::Get().get())); 89 temp_dir_.GetPath(), base::ThreadTaskRunnerHandle::Get().get()));
90 ASSERT_TRUE(metadata_storage_->Initialize()); 90 ASSERT_TRUE(metadata_storage_->Initialize());
91 91
92 cache_.reset(new FileCache(metadata_storage_.get(), 92 cache_.reset(new FileCache(metadata_storage_.get(), temp_dir_.GetPath(),
93 temp_dir_.path(),
94 base::ThreadTaskRunnerHandle::Get().get(), 93 base::ThreadTaskRunnerHandle::Get().get(),
95 NULL /* free_disk_space_getter */)); 94 NULL /* free_disk_space_getter */));
96 ASSERT_TRUE(cache_->Initialize()); 95 ASSERT_TRUE(cache_->Initialize());
97 96
98 metadata_.reset(new ResourceMetadata( 97 metadata_.reset(new ResourceMetadata(
99 metadata_storage_.get(), cache_.get(), 98 metadata_storage_.get(), cache_.get(),
100 base::ThreadTaskRunnerHandle::Get().get())); 99 base::ThreadTaskRunnerHandle::Get().get()));
101 ASSERT_EQ(FILE_ERROR_OK, metadata_->Initialize()); 100 ASSERT_EQ(FILE_ERROR_OK, metadata_->Initialize());
102 101
103 about_resource_loader_.reset(new AboutResourceLoader(scheduler_.get())); 102 about_resource_loader_.reset(new AboutResourceLoader(scheduler_.get()));
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 247
249 // Unlock the loader, this should resume the pending udpate. 248 // Unlock the loader, this should resume the pending udpate.
250 lock.reset(); 249 lock.reset();
251 base::RunLoop().RunUntilIdle(); 250 base::RunLoop().RunUntilIdle();
252 EXPECT_EQ(1U, observer.changed_directories().count( 251 EXPECT_EQ(1U, observer.changed_directories().count(
253 util::GetDriveMyDriveRootPath())); 252 util::GetDriveMyDriveRootPath()));
254 } 253 }
255 254
256 } // namespace internal 255 } // namespace internal
257 } // namespace drive 256 } // namespace drive
OLDNEW
« no previous file with comments | « components/drive/chromeos/file_cache_unittest.cc ('k') | components/drive/drive_api_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698