Quota: Minor cleanup
This change cleans-up the unnecessary `profile_path` parameter
for `StorageDirectory::EnumerateDoomedDirectories`.
Change-Id: Ib3adf720885ff27bb9f8a69395dedeb581d4b8e1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3587291
Reviewed-by: Evan Stade <estade@chromium.org>
Commit-Queue: Ayu Ishii <ayui@chromium.org>
Cr-Commit-Position: refs/heads/main@{#992721}
diff --git a/storage/browser/quota/storage_directory.cc b/storage/browser/quota/storage_directory.cc
index 1fd4fbd..11b85fdb 100644
--- a/storage/browser/quota/storage_directory.cc
+++ b/storage/browser/quota/storage_directory.cc
@@ -39,17 +39,16 @@
}
void StorageDirectory::ClearDoomed() {
- std::set<base::FilePath> paths =
- EnumerateDoomedDirectories(web_storage_path_.DirName());
+ std::set<base::FilePath> paths = EnumerateDoomedDirectories();
for (const base::FilePath& path : paths)
base::DeletePathRecursively(path);
}
-std::set<base::FilePath> StorageDirectory::EnumerateDoomedDirectories(
- const base::FilePath& profile_path) {
+std::set<base::FilePath> StorageDirectory::EnumerateDoomedDirectories() {
base::FileEnumerator enumerator(
- profile_path, /*recursive=*/false, base::FileEnumerator::DIRECTORIES,
+ web_storage_path_.DirName(), /*recursive=*/false,
+ base::FileEnumerator::DIRECTORIES,
base::StrCat(
{kWebStorageDirectory, kDoomedPathName, FILE_PATH_LITERAL("*")}));
diff --git a/storage/browser/quota/storage_directory.h b/storage/browser/quota/storage_directory.h
index 0e3fd548..8e51798 100644
--- a/storage/browser/quota/storage_directory.h
+++ b/storage/browser/quota/storage_directory.h
@@ -36,14 +36,12 @@
// for incognito.
const base::FilePath& path() const { return web_storage_path_; }
- std::set<base::FilePath> EnumerateDoomedDirectoriesForTesting(
- const base::FilePath& profile_path) {
- return EnumerateDoomedDirectories(profile_path);
+ std::set<base::FilePath> EnumerateDoomedDirectoriesForTesting() {
+ return EnumerateDoomedDirectories();
}
private:
- std::set<base::FilePath> EnumerateDoomedDirectories(
- const base::FilePath& profile_path);
+ std::set<base::FilePath> EnumerateDoomedDirectories();
const base::FilePath web_storage_path_;
};
diff --git a/storage/browser/quota/storage_directory_unittest.cc b/storage/browser/quota/storage_directory_unittest.cc
index d6eb920..e1f50200 100644
--- a/storage/browser/quota/storage_directory_unittest.cc
+++ b/storage/browser/quota/storage_directory_unittest.cc
@@ -23,8 +23,6 @@
}
void TearDown() override { ASSERT_TRUE(temp_directory_.Delete()); }
- base::FilePath ProfilePath() { return temp_directory_.GetPath(); }
-
protected:
base::ScopedTempDir temp_directory_;
std::unique_ptr<StorageDirectory> storage_directory_;
@@ -55,12 +53,11 @@
EXPECT_FALSE(base::PathExists(storage_path));
std::set<base::FilePath> directories =
- storage_directory_->EnumerateDoomedDirectoriesForTesting(ProfilePath());
+ storage_directory_->EnumerateDoomedDirectoriesForTesting();
EXPECT_EQ(directories.size(), 1u);
storage_directory_->ClearDoomed();
- directories =
- storage_directory_->EnumerateDoomedDirectoriesForTesting(ProfilePath());
+ directories = storage_directory_->EnumerateDoomedDirectoriesForTesting();
EXPECT_EQ(directories.size(), 0u);
}
@@ -74,12 +71,11 @@
}
std::set<base::FilePath> directories =
- storage_directory_->EnumerateDoomedDirectoriesForTesting(ProfilePath());
+ storage_directory_->EnumerateDoomedDirectoriesForTesting();
EXPECT_EQ(directories.size(), 5u);
storage_directory_->ClearDoomed();
- directories =
- storage_directory_->EnumerateDoomedDirectoriesForTesting(ProfilePath());
+ directories = storage_directory_->EnumerateDoomedDirectoriesForTesting();
EXPECT_EQ(directories.size(), 0u);
}