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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/fileapi/file_system_quota_client_unittest.cc

Issue 654403002: Convert ARRAYSIZE_UNSAFE -> arraysize in content/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/fileapi/file_system_operation_impl_unittest.cc ('k') | content/browser/fileapi/file_writer_delegate_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/fileapi/file_system_quota_client_unittest.cc
diff --git a/content/browser/fileapi/file_system_quota_client_unittest.cc b/content/browser/fileapi/file_system_quota_client_unittest.cc
index 74f8be0ce3b56558de6bd806262554e0db61ab42..098eeb3ecd8f83771f2bc8455269d711a52081cb 100644
--- a/content/browser/fileapi/file_system_quota_client_unittest.cc
+++ b/content/browser/fileapi/file_system_quota_client_unittest.cc
@@ -250,7 +250,7 @@ TEST_F(FileSystemQuotaClientTest, NoFileTest) {
const TestFile kFiles[] = {
{true, NULL, 0, kDummyURL1, kTemporary},
};
- InitializeOriginFiles(quota_client.get(), kFiles, ARRAYSIZE_UNSAFE(kFiles));
+ InitializeOriginFiles(quota_client.get(), kFiles, arraysize(kFiles));
for (int i = 0; i < 2; i++) {
EXPECT_EQ(0, GetOriginUsage(quota_client.get(), kDummyURL1, kTemporary));
@@ -263,9 +263,9 @@ TEST_F(FileSystemQuotaClientTest, OneFileTest) {
{true, NULL, 0, kDummyURL1, kTemporary},
{false, "foo", 4921, kDummyURL1, kTemporary},
};
- InitializeOriginFiles(quota_client.get(), kFiles, ARRAYSIZE_UNSAFE(kFiles));
+ InitializeOriginFiles(quota_client.get(), kFiles, arraysize(kFiles));
const int64 file_paths_cost = ComputeFilePathsCostForOriginAndType(
- kFiles, ARRAYSIZE_UNSAFE(kFiles), kDummyURL1, kTemporary);
+ kFiles, arraysize(kFiles), kDummyURL1, kTemporary);
for (int i = 0; i < 2; i++) {
EXPECT_EQ(4921 + file_paths_cost,
@@ -280,9 +280,9 @@ TEST_F(FileSystemQuotaClientTest, TwoFilesTest) {
{false, "foo", 10310, kDummyURL1, kTemporary},
{false, "bar", 41, kDummyURL1, kTemporary},
};
- InitializeOriginFiles(quota_client.get(), kFiles, ARRAYSIZE_UNSAFE(kFiles));
+ InitializeOriginFiles(quota_client.get(), kFiles, arraysize(kFiles));
const int64 file_paths_cost = ComputeFilePathsCostForOriginAndType(
- kFiles, ARRAYSIZE_UNSAFE(kFiles), kDummyURL1, kTemporary);
+ kFiles, arraysize(kFiles), kDummyURL1, kTemporary);
for (int i = 0; i < 2; i++) {
EXPECT_EQ(10310 + 41 + file_paths_cost,
@@ -298,9 +298,9 @@ TEST_F(FileSystemQuotaClientTest, EmptyFilesTest) {
{false, "bar", 0, kDummyURL1, kTemporary},
{false, "baz", 0, kDummyURL1, kTemporary},
};
- InitializeOriginFiles(quota_client.get(), kFiles, ARRAYSIZE_UNSAFE(kFiles));
+ InitializeOriginFiles(quota_client.get(), kFiles, arraysize(kFiles));
const int64 file_paths_cost = ComputeFilePathsCostForOriginAndType(
- kFiles, ARRAYSIZE_UNSAFE(kFiles), kDummyURL1, kTemporary);
+ kFiles, arraysize(kFiles), kDummyURL1, kTemporary);
for (int i = 0; i < 2; i++) {
EXPECT_EQ(file_paths_cost,
@@ -316,9 +316,9 @@ TEST_F(FileSystemQuotaClientTest, SubDirectoryTest) {
{false, "dirtest/foo", 11921, kDummyURL1, kTemporary},
{false, "bar", 4814, kDummyURL1, kTemporary},
};
- InitializeOriginFiles(quota_client.get(), kFiles, ARRAYSIZE_UNSAFE(kFiles));
+ InitializeOriginFiles(quota_client.get(), kFiles, arraysize(kFiles));
const int64 file_paths_cost = ComputeFilePathsCostForOriginAndType(
- kFiles, ARRAYSIZE_UNSAFE(kFiles), kDummyURL1, kTemporary);
+ kFiles, arraysize(kFiles), kDummyURL1, kTemporary);
for (int i = 0; i < 2; i++) {
EXPECT_EQ(11921 + 4814 + file_paths_cost,
@@ -338,11 +338,11 @@ TEST_F(FileSystemQuotaClientTest, MultiTypeTest) {
{false, "dirtest/foo", 193, kDummyURL1, kPersistent},
{false, "bar", 9, kDummyURL1, kPersistent},
};
- InitializeOriginFiles(quota_client.get(), kFiles, ARRAYSIZE_UNSAFE(kFiles));
+ InitializeOriginFiles(quota_client.get(), kFiles, arraysize(kFiles));
const int64 file_paths_cost_temporary = ComputeFilePathsCostForOriginAndType(
- kFiles, ARRAYSIZE_UNSAFE(kFiles), kDummyURL1, kTemporary);
+ kFiles, arraysize(kFiles), kDummyURL1, kTemporary);
const int64 file_paths_cost_persistent = ComputeFilePathsCostForOriginAndType(
- kFiles, ARRAYSIZE_UNSAFE(kFiles), kDummyURL1, kTemporary);
+ kFiles, arraysize(kFiles), kDummyURL1, kTemporary);
for (int i = 0; i < 2; i++) {
EXPECT_EQ(133 + 14 + file_paths_cost_temporary,
@@ -372,16 +372,16 @@ TEST_F(FileSystemQuotaClientTest, MultiDomainTest) {
{false, "dom/fan", 2013, kDummyURL2, kPersistent},
{false, "baz", 18, kDummyURL2, kPersistent},
};
- InitializeOriginFiles(quota_client.get(), kFiles, ARRAYSIZE_UNSAFE(kFiles));
+ InitializeOriginFiles(quota_client.get(), kFiles, arraysize(kFiles));
const int64 file_paths_cost_temporary1 = ComputeFilePathsCostForOriginAndType(
- kFiles, ARRAYSIZE_UNSAFE(kFiles), kDummyURL1, kTemporary);
+ kFiles, arraysize(kFiles), kDummyURL1, kTemporary);
const int64 file_paths_cost_persistent1 =
- ComputeFilePathsCostForOriginAndType(kFiles, ARRAYSIZE_UNSAFE(kFiles),
+ ComputeFilePathsCostForOriginAndType(kFiles, arraysize(kFiles),
kDummyURL1, kPersistent);
const int64 file_paths_cost_temporary2 = ComputeFilePathsCostForOriginAndType(
- kFiles, ARRAYSIZE_UNSAFE(kFiles), kDummyURL2, kTemporary);
+ kFiles, arraysize(kFiles), kDummyURL2, kTemporary);
const int64 file_paths_cost_persistent2 =
- ComputeFilePathsCostForOriginAndType(kFiles, ARRAYSIZE_UNSAFE(kFiles),
+ ComputeFilePathsCostForOriginAndType(kFiles, arraysize(kFiles),
kDummyURL2, kPersistent);
for (int i = 0; i < 2; i++) {
@@ -403,9 +403,9 @@ TEST_F(FileSystemQuotaClientTest, GetUsage_MultipleTasks) {
{false, "foo", 11, kDummyURL1, kTemporary},
{false, "bar", 22, kDummyURL1, kTemporary},
};
- InitializeOriginFiles(quota_client.get(), kFiles, ARRAYSIZE_UNSAFE(kFiles));
+ InitializeOriginFiles(quota_client.get(), kFiles, arraysize(kFiles));
const int64 file_paths_cost = ComputeFilePathsCostForOriginAndType(
- kFiles, ARRAYSIZE_UNSAFE(kFiles), kDummyURL1, kTemporary);
+ kFiles, arraysize(kFiles), kDummyURL1, kTemporary);
// Dispatching three GetUsage tasks.
set_additional_callback_count(0);
@@ -433,7 +433,7 @@ TEST_F(FileSystemQuotaClientTest, GetOriginsForType) {
{true, NULL, 0, kDummyURL2, kTemporary},
{true, NULL, 0, kDummyURL3, kPersistent},
};
- InitializeOriginFiles(quota_client.get(), kFiles, ARRAYSIZE_UNSAFE(kFiles));
+ InitializeOriginFiles(quota_client.get(), kFiles, arraysize(kFiles));
std::set<GURL> origins = GetOriginsForType(quota_client.get(), kTemporary);
EXPECT_EQ(2U, origins.size());
@@ -456,7 +456,7 @@ TEST_F(FileSystemQuotaClientTest, GetOriginsForHost) {
{true, NULL, 0, kURL4, kTemporary},
{true, NULL, 0, kURL5, kPersistent},
};
- InitializeOriginFiles(quota_client.get(), kFiles, ARRAYSIZE_UNSAFE(kFiles));
+ InitializeOriginFiles(quota_client.get(), kFiles, arraysize(kFiles));
std::set<GURL> origins = GetOriginsForHost(
quota_client.get(), kTemporary, "foo.com");
@@ -474,7 +474,7 @@ TEST_F(FileSystemQuotaClientTest, IncognitoTest) {
{true, NULL, 0, kDummyURL1, kTemporary},
{false, "foo", 10, kDummyURL1, kTemporary},
};
- InitializeOriginFiles(quota_client.get(), kFiles, ARRAYSIZE_UNSAFE(kFiles));
+ InitializeOriginFiles(quota_client.get(), kFiles, arraysize(kFiles));
// Having files in the usual directory wouldn't affect the result
// queried in incognito mode.
@@ -505,21 +505,21 @@ TEST_F(FileSystemQuotaClientTest, DeleteOriginTest) {
{true, NULL, 0, "https://bar.com/", kTemporary},
{false, "g", 64, "https://bar.com/", kTemporary},
};
- InitializeOriginFiles(quota_client.get(), kFiles, ARRAYSIZE_UNSAFE(kFiles));
+ InitializeOriginFiles(quota_client.get(), kFiles, arraysize(kFiles));
const int64 file_paths_cost_temporary_foo_https =
- ComputeFilePathsCostForOriginAndType(kFiles, ARRAYSIZE_UNSAFE(kFiles),
+ ComputeFilePathsCostForOriginAndType(kFiles, arraysize(kFiles),
"https://foo.com/", kTemporary);
const int64 file_paths_cost_persistent_foo =
- ComputeFilePathsCostForOriginAndType(kFiles, ARRAYSIZE_UNSAFE(kFiles),
+ ComputeFilePathsCostForOriginAndType(kFiles, arraysize(kFiles),
"http://foo.com/", kPersistent);
const int64 file_paths_cost_temporary_bar =
- ComputeFilePathsCostForOriginAndType(kFiles, ARRAYSIZE_UNSAFE(kFiles),
+ ComputeFilePathsCostForOriginAndType(kFiles, arraysize(kFiles),
"http://bar.com/", kTemporary);
const int64 file_paths_cost_temporary_bar_https =
- ComputeFilePathsCostForOriginAndType(kFiles, ARRAYSIZE_UNSAFE(kFiles),
+ ComputeFilePathsCostForOriginAndType(kFiles, arraysize(kFiles),
"https://bar.com/", kTemporary);
const int64 file_paths_cost_persistent_bar_https =
- ComputeFilePathsCostForOriginAndType(kFiles, ARRAYSIZE_UNSAFE(kFiles),
+ ComputeFilePathsCostForOriginAndType(kFiles, arraysize(kFiles),
"https://bar.com/", kPersistent);
DeleteOriginData(quota_client.get(), "http://foo.com/", kTemporary);
« no previous file with comments | « content/browser/fileapi/file_system_operation_impl_unittest.cc ('k') | content/browser/fileapi/file_writer_delegate_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698