Use base::size rather than arraysize in content/.
This is purely a mechanical change; there is no intended behavior change.
BUG=837308
[email protected]
Change-Id: I5ce196bbb75462a0967a95d1b5fd2e72df2c86f4
Reviewed-on: https://chromium-review.googlesource.com/c/1390894
Reviewed-by: Avi Drissman <[email protected]>
Commit-Queue: Avi Drissman <[email protected]>
Cr-Commit-Position: refs/heads/master@{#618881}diff --git a/content/browser/accessibility/accessibility_tree_formatter_android.cc b/content/browser/accessibility/accessibility_tree_formatter_android.cc
index 282de50..7202c9e2 100644
--- a/content/browser/accessibility/accessibility_tree_formatter_android.cc
+++ b/content/browser/accessibility/accessibility_tree_formatter_android.cc
@@ -10,7 +10,7 @@
#include "base/android/jni_string.h"
#include "base/files/file_path.h"
#include "base/json/json_writer.h"
-#include "base/macros.h"
+#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
@@ -188,14 +188,14 @@
&line);
}
- for (unsigned i = 0; i < arraysize(BOOL_ATTRIBUTES); i++) {
+ for (unsigned i = 0; i < base::size(BOOL_ATTRIBUTES); i++) {
const char* attribute_name = BOOL_ATTRIBUTES[i];
bool value;
if (dict.GetBoolean(attribute_name, &value) && value)
WriteAttribute(true, attribute_name, &line);
}
- for (unsigned i = 0; i < arraysize(STRING_ATTRIBUTES); i++) {
+ for (unsigned i = 0; i < base::size(STRING_ATTRIBUTES); i++) {
const char* attribute_name = STRING_ATTRIBUTES[i];
std::string value;
if (!dict.GetString(attribute_name, &value) || value.empty())
@@ -205,7 +205,7 @@
&line);
}
- for (unsigned i = 0; i < arraysize(INT_ATTRIBUTES); i++) {
+ for (unsigned i = 0; i < base::size(INT_ATTRIBUTES); i++) {
const char* attribute_name = INT_ATTRIBUTES[i];
int value;
if (!dict.GetInteger(attribute_name, &value) || value == 0)
diff --git a/content/browser/accessibility/accessibility_tree_formatter_utils_win.cc b/content/browser/accessibility/accessibility_tree_formatter_utils_win.cc
index a54957c6..91bfb20 100644
--- a/content/browser/accessibility/accessibility_tree_formatter_utils_win.cc
+++ b/content/browser/accessibility/accessibility_tree_formatter_utils_win.cc
@@ -9,8 +9,8 @@
#include <map>
#include <string>
-#include "base/macros.h"
#include "base/memory/singleton.h"
+#include "base/stl_util.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "third_party/iaccessible2/ia2_api_all.h"
@@ -76,7 +76,7 @@
QUOTE(ROLE_SYSTEM_WHITESPACE), QUOTE(ROLE_SYSTEM_WINDOW),
};
- return GetNameForPlatformConstant(ia_table, arraysize(ia_table), ia_role);
+ return GetNameForPlatformConstant(ia_table, base::size(ia_table), ia_role);
}
CONTENT_EXPORT base::string16 IAccessible2RoleToString(int32_t ia2_role) {
@@ -136,7 +136,7 @@
QUOTE(IA2_ROLE_CONTENT_INSERTION),
};
- return GetNameForPlatformConstant(ia2_table, arraysize(ia2_table), ia2_role);
+ return GetNameForPlatformConstant(ia2_table, base::size(ia2_table), ia2_role);
}
CONTENT_EXPORT base::string16 AccessibilityEventToString(int32_t event) {
@@ -210,7 +210,8 @@
QUOTE(IA2_EVENT_VISIBLE_DATA_CHANGED),
};
- return GetNameForPlatformConstant(event_table, arraysize(event_table), event);
+ return GetNameForPlatformConstant(event_table, base::size(event_table),
+ event);
}
void IAccessibleStateToStringVector(int32_t ia_state,
diff --git a/content/browser/accessibility/browser_accessibility_state_impl_win.cc b/content/browser/accessibility/browser_accessibility_state_impl_win.cc
index 625be87..8c876758 100644
--- a/content/browser/accessibility/browser_accessibility_state_impl_win.cc
+++ b/content/browser/accessibility/browser_accessibility_state_impl_win.cc
@@ -12,8 +12,8 @@
#include <memory>
#include "base/files/file_path.h"
-#include "base/macros.h"
#include "base/metrics/histogram_macros.h"
+#include "base/stl_util.h"
#include "base/strings/string_util.h"
#include "ui/accessibility/platform/ax_platform_node_win.h"
@@ -125,7 +125,7 @@
size_t module_count = bytes_required / sizeof(HMODULE);
for (size_t i = 0; i < module_count; i++) {
TCHAR filename[MAX_PATH];
- GetModuleFileName(modules[i], filename, arraysize(filename));
+ GetModuleFileName(modules[i], filename, base::size(filename));
base::string16 module_name(base::FilePath(filename).BaseName().value());
if (base::LowerCaseEqualsASCII(module_name, "fsdomsrv.dll"))
jaws = true;
diff --git a/content/browser/android/content_feature_list.cc b/content/browser/android/content_feature_list.cc
index 507ec54..538ef50a 100644
--- a/content/browser/android/content_feature_list.cc
+++ b/content/browser/android/content_feature_list.cc
@@ -6,7 +6,7 @@
#include "base/android/jni_string.h"
#include "base/feature_list.h"
-#include "base/macros.h"
+#include "base/stl_util.h"
#include "content/public/common/content_features.h"
#include "jni/ContentFeatureList_jni.h"
@@ -27,7 +27,7 @@
};
const base::Feature* FindFeatureExposedToJava(const std::string& feature_name) {
- for (size_t i = 0; i < arraysize(kFeaturesExposedToJava); ++i) {
+ for (size_t i = 0; i < base::size(kFeaturesExposedToJava); ++i) {
if (kFeaturesExposedToJava[i]->name == feature_name)
return kFeaturesExposedToJava[i];
}
diff --git a/content/browser/android/java/java_type_unittest.cc b/content/browser/android/java/java_type_unittest.cc
index 44a143b3..6594b038 100644
--- a/content/browser/android/java/java_type_unittest.cc
+++ b/content/browser/android/java/java_type_unittest.cc
@@ -8,7 +8,7 @@
#include <memory>
-#include "base/macros.h"
+#include "base/stl_util.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace content {
@@ -38,7 +38,7 @@
"Ljava/lang/Object;"},
{"my.nested.Type$Foo", JavaType::TypeObject, "my/nested/Type$Foo",
"Lmy/nested/Type$Foo;"}};
- for (size_t i = 0; i < arraysize(scalar_types); ++i) {
+ for (size_t i = 0; i < base::size(scalar_types); ++i) {
JavaType jt = JavaType::CreateFromBinaryName(scalar_types[i].binary_type);
EXPECT_EQ(scalar_types[i].java_type, jt.type);
EXPECT_FALSE(jt.inner_type);
diff --git a/content/browser/appcache/appcache_database.cc b/content/browser/appcache/appcache_database.cc
index 11dfdfa..0d5ae8d9 100644
--- a/content/browser/appcache/appcache_database.cc
+++ b/content/browser/appcache/appcache_database.cc
@@ -9,7 +9,7 @@
#include "base/command_line.h"
#include "base/files/file_util.h"
#include "base/logging.h"
-#include "base/macros.h"
+#include "base/stl_util.h"
#include "base/strings/utf_string_conversions.h"
#include "content/browser/appcache/appcache_entry.h"
#include "content/browser/appcache/appcache_histograms.h"
@@ -167,8 +167,8 @@
true },
};
-const int kTableCount = arraysize(kTables);
-const int kIndexCount = arraysize(kIndexes);
+const int kTableCount = base::size(kTables);
+const int kIndexCount = base::size(kIndexes);
bool CreateTable(sql::Database* db, const TableInfo& info) {
std::string sql("CREATE TABLE ");
diff --git a/content/browser/appcache/appcache_manifest_parser_unittest.cc b/content/browser/appcache/appcache_manifest_parser_unittest.cc
index 07f005b..dba03d1 100644
--- a/content/browser/appcache/appcache_manifest_parser_unittest.cc
+++ b/content/browser/appcache/appcache_manifest_parser_unittest.cc
@@ -7,7 +7,7 @@
#include <string>
#include <vector>
-#include "base/macros.h"
+#include "base/stl_util.h"
#include "content/browser/appcache/appcache_manifest_parser.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "url/gurl.h"
@@ -42,7 +42,7 @@
"\xEF\xBE\xBF" "CACHE MANIFEST\r", // bad UTF-8 BOM value
};
- for (size_t i = 0; i < arraysize(kBadSignatures); ++i) {
+ for (size_t i = 0; i < base::size(kBadSignatures); ++i) {
const std::string bad = kBadSignatures[i];
EXPECT_FALSE(ParseManifest(url, bad.c_str(), bad.length(),
PARSE_MANIFEST_ALLOWING_DANGEROUS_FEATURES,
@@ -61,7 +61,7 @@
"\xEF\xBB\xBF" "CACHE MANIFEST \r\n", // BOM present
};
- for (size_t i = 0; i < arraysize(kGoodSignatures); ++i) {
+ for (size_t i = 0; i < base::size(kGoodSignatures); ++i) {
const std::string good = kGoodSignatures[i];
EXPECT_TRUE(ParseManifest(url, good.c_str(), good.length(),
PARSE_MANIFEST_ALLOWING_DANGEROUS_FEATURES,
diff --git a/content/browser/appcache/appcache_request_handler_unittest.cc b/content/browser/appcache/appcache_request_handler_unittest.cc
index 0ed52f2..8d44fb3 100644
--- a/content/browser/appcache/appcache_request_handler_unittest.cc
+++ b/content/browser/appcache/appcache_request_handler_unittest.cc
@@ -15,10 +15,10 @@
#include "base/callback.h"
#include "base/containers/stack.h"
#include "base/location.h"
-#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "base/message_loop/message_loop.h"
#include "base/single_thread_task_runner.h"
+#include "base/stl_util.h"
#include "base/strings/stringprintf.h"
#include "base/synchronization/waitable_event.h"
#include "base/task/post_task.h"
@@ -554,7 +554,7 @@
"\0";
net::HttpResponseInfo info;
info.headers = new net::HttpResponseHeaders(
- std::string(kOverrideHeaders, arraysize(kOverrideHeaders)));
+ std::string(kOverrideHeaders, base::size(kOverrideHeaders)));
SimulateResponseInfo(info);
SetAppCacheJob(handler_->MaybeLoadFallbackForResponse(nullptr));
diff --git a/content/browser/appcache/appcache_response_unittest.cc b/content/browser/appcache/appcache_response_unittest.cc
index 5d0aaa0a0..e9cc370 100644
--- a/content/browser/appcache/appcache_response_unittest.cc
+++ b/content/browser/appcache/appcache_response_unittest.cc
@@ -14,10 +14,10 @@
#include "base/compiler_specific.h"
#include "base/containers/stack.h"
#include "base/location.h"
-#include "base/macros.h"
#include "base/message_loop/message_loop.h"
#include "base/pickle.h"
#include "base/single_thread_task_runner.h"
+#include "base/stl_util.h"
#include "base/synchronization/waitable_event.h"
#include "base/test/scoped_task_environment.h"
#include "base/threading/thread.h"
@@ -171,7 +171,7 @@
static const char kHttpBody[] = "Hello";
scoped_refptr<IOBuffer> body =
base::MakeRefCounted<WrappedIOBuffer>(kHttpBody);
- std::string raw_headers(kHttpHeaders, arraysize(kHttpHeaders));
+ std::string raw_headers(kHttpHeaders, base::size(kHttpHeaders));
WriteResponse(
MakeHttpResponseInfo(raw_headers), body.get(), strlen(kHttpBody));
}
@@ -495,7 +495,7 @@
void AmountWritten() {
static const char kHttpHeaders[] = "HTTP/1.0 200 OK\0\0";
- std::string raw_headers(kHttpHeaders, arraysize(kHttpHeaders));
+ std::string raw_headers(kHttpHeaders, base::size(kHttpHeaders));
std::unique_ptr<net::HttpResponseInfo> head =
MakeHttpResponseInfo(raw_headers);
int expected_amount_written =
diff --git a/content/browser/appcache/appcache_service_unittest.cc b/content/browser/appcache/appcache_service_unittest.cc
index a50ce5ca..3b1e665 100644
--- a/content/browser/appcache/appcache_service_unittest.cc
+++ b/content/browser/appcache/appcache_service_unittest.cc
@@ -9,10 +9,10 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/location.h"
-#include "base/macros.h"
#include "base/pickle.h"
#include "base/run_loop.h"
#include "base/single_thread_task_runner.h"
+#include "base/stl_util.h"
#include "base/test/scoped_task_environment.h"
#include "base/threading/thread_task_runner_handle.h"
#include "content/browser/appcache/appcache_response.h"
@@ -162,7 +162,7 @@
info->response_time = base::Time::Now();
info->was_cached = false;
info->headers = new net::HttpResponseHeaders(
- std::string(kMockHeaders, arraysize(kMockHeaders)));
+ std::string(kMockHeaders, base::size(kMockHeaders)));
return info;
}
diff --git a/content/browser/appcache/appcache_storage_impl_unittest.cc b/content/browser/appcache/appcache_storage_impl_unittest.cc
index 9599a172..1ee4bbef 100644
--- a/content/browser/appcache/appcache_storage_impl_unittest.cc
+++ b/content/browser/appcache/appcache_storage_impl_unittest.cc
@@ -16,10 +16,10 @@
#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
#include "base/location.h"
-#include "base/macros.h"
#include "base/message_loop/message_loop.h"
#include "base/sequenced_task_runner.h"
#include "base/single_thread_task_runner.h"
+#include "base/stl_util.h"
#include "base/synchronization/waitable_event.h"
#include "base/test/scoped_task_environment.h"
#include "base/threading/sequenced_task_runner_handle.h"
@@ -91,14 +91,14 @@
"\n";
if (path == "/manifest") {
- (*headers) = std::string(manifest_headers, arraysize(manifest_headers));
+ (*headers) = std::string(manifest_headers, base::size(manifest_headers));
(*body) = "CACHE MANIFEST\n";
} else if (path == "/empty.html") {
- (*headers) = std::string(page_headers, arraysize(page_headers));
+ (*headers) = std::string(page_headers, base::size(page_headers));
(*body) = "";
} else {
- (*headers) = std::string(not_found_headers,
- arraysize(not_found_headers));
+ (*headers) =
+ std::string(not_found_headers, base::size(not_found_headers));
(*body) = "";
}
}
diff --git a/content/browser/appcache/appcache_update_job_unittest.cc b/content/browser/appcache/appcache_update_job_unittest.cc
index ffb2202..d45f46e0 100644
--- a/content/browser/appcache/appcache_update_job_unittest.cc
+++ b/content/browser/appcache/appcache_update_job_unittest.cc
@@ -13,7 +13,6 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/location.h"
-#include "base/macros.h"
#include "base/memory/ptr_util.h"
#include "base/message_loop/message_loop.h"
#include "base/single_thread_task_runner.h"
@@ -125,46 +124,46 @@
"\n";
if (path == "/files/missing-mime-manifest") {
- (*headers) = std::string(ok_headers, arraysize(ok_headers));
+ (*headers) = std::string(ok_headers, base::size(ok_headers));
(*body) = "CACHE MANIFEST\n";
} else if (path == "/files/bad-manifest") {
- (*headers) = std::string(manifest_headers, arraysize(manifest_headers));
+ (*headers) = std::string(manifest_headers, base::size(manifest_headers));
(*body) = "BAD CACHE MANIFEST";
} else if (path == "/files/empty1") {
- (*headers) = std::string(ok_headers, arraysize(ok_headers));
+ (*headers) = std::string(ok_headers, base::size(ok_headers));
(*body) = "";
} else if (path == "/files/empty-file-manifest") {
- (*headers) = std::string(manifest_headers, arraysize(manifest_headers));
+ (*headers) = std::string(manifest_headers, base::size(manifest_headers));
(*body) = "CACHE MANIFEST\n"
"empty1\n";
} else if (path == "/files/empty-manifest") {
- (*headers) = std::string(manifest_headers, arraysize(manifest_headers));
+ (*headers) = std::string(manifest_headers, base::size(manifest_headers));
(*body) = "CACHE MANIFEST\n";
} else if (path == "/files/explicit1") {
- (*headers) = std::string(ok_headers, arraysize(ok_headers));
+ (*headers) = std::string(ok_headers, base::size(ok_headers));
(*body) = "explicit1";
} else if (path == "/files/explicit2") {
- (*headers) = std::string(ok_headers, arraysize(ok_headers));
+ (*headers) = std::string(ok_headers, base::size(ok_headers));
(*body) = "explicit2";
} else if (path == "/files/fallback1a") {
- (*headers) = std::string(ok_headers, arraysize(ok_headers));
+ (*headers) = std::string(ok_headers, base::size(ok_headers));
(*body) = "fallback1a";
} else if (path == "/files/intercept1a") {
- (*headers) = std::string(ok_headers, arraysize(ok_headers));
+ (*headers) = std::string(ok_headers, base::size(ok_headers));
(*body) = "intercept1a";
} else if (path == "/files/gone") {
- (*headers) = std::string(gone_headers, arraysize(gone_headers));
+ (*headers) = std::string(gone_headers, base::size(gone_headers));
(*body) = "";
} else if (path == "/files/manifest1") {
- (*headers) = std::string(manifest_headers, arraysize(manifest_headers));
+ (*headers) = std::string(manifest_headers, base::size(manifest_headers));
(*body) = kManifest1Contents;
} else if (path == "/files/manifest1-with-notmodified") {
- (*headers) = std::string(manifest_headers, arraysize(manifest_headers));
+ (*headers) = std::string(manifest_headers, base::size(manifest_headers));
(*body) = kManifest1Contents;
(*body).append("CACHE:\n"
"notmodified\n");
} else if (path == "/files/manifest-fb-404") {
- (*headers) = std::string(manifest_headers, arraysize(manifest_headers));
+ (*headers) = std::string(manifest_headers, base::size(manifest_headers));
(*body) = "CACHE MANIFEST\n"
"explicit1\n"
"FALLBACK:\n"
@@ -173,7 +172,7 @@
"NETWORK:\n"
"online1\n";
} else if (path == "/files/manifest-merged-types") {
- (*headers) = std::string(manifest_headers, arraysize(manifest_headers));
+ (*headers) = std::string(manifest_headers, base::size(manifest_headers));
(*body) = "CACHE MANIFEST\n"
"explicit1\n"
"# manifest is also an explicit entry\n"
@@ -184,7 +183,7 @@
"NETWORK:\n"
"online1\n";
} else if (path == "/files/manifest-with-404") {
- (*headers) = std::string(manifest_headers, arraysize(manifest_headers));
+ (*headers) = std::string(manifest_headers, base::size(manifest_headers));
(*body) = "CACHE MANIFEST\n"
"explicit-404\n"
"explicit1\n"
@@ -195,32 +194,31 @@
"NETWORK:\n"
"online1\n";
} else if (path == "/files/manifest-with-intercept") {
- (*headers) = std::string(manifest_headers, arraysize(manifest_headers));
+ (*headers) = std::string(manifest_headers, base::size(manifest_headers));
(*body) = "CACHE MANIFEST\n"
"CHROMIUM-INTERCEPT:\n"
"intercept1 return intercept1a\n";
} else if (path == "/files/notmodified") {
- (*headers) = std::string(not_modified_headers,
- arraysize(not_modified_headers));
+ (*headers) =
+ std::string(not_modified_headers, base::size(not_modified_headers));
(*body) = "";
} else if (path == "/files/servererror") {
- (*headers) = std::string(error_headers,
- arraysize(error_headers));
+ (*headers) = std::string(error_headers, base::size(error_headers));
(*body) = "error";
} else if (path == "/files/valid_cross_origin_https_manifest") {
- (*headers) = std::string(manifest_headers, arraysize(manifest_headers));
+ (*headers) = std::string(manifest_headers, base::size(manifest_headers));
(*body) = "CACHE MANIFEST\n"
"https://cross_origin_host/files/explicit1\n";
} else if (path == "/files/invalid_cross_origin_https_manifest") {
- (*headers) = std::string(manifest_headers, arraysize(manifest_headers));
+ (*headers) = std::string(manifest_headers, base::size(manifest_headers));
(*body) = "CACHE MANIFEST\n"
"https://cross_origin_host/files/no-store-headers\n";
} else if (path == "/files/no-store-headers") {
- (*headers) = std::string(no_store_headers, arraysize(no_store_headers));
+ (*headers) = std::string(no_store_headers, base::size(no_store_headers));
(*body) = "no-store";
} else {
- (*headers) = std::string(not_found_headers,
- arraysize(not_found_headers));
+ (*headers) =
+ std::string(not_found_headers, base::size(not_found_headers));
(*body) = "";
}
}
@@ -453,12 +451,12 @@
switch (retry_after_) {
case NO_RETRY_AFTER:
- return std::string(no_retry_after, arraysize(no_retry_after));
+ return std::string(no_retry_after, base::size(no_retry_after));
case NONZERO_RETRY_AFTER:
- return std::string(nonzero, arraysize(nonzero));
+ return std::string(nonzero, base::size(nonzero));
case RETRY_AFTER_0:
default:
- return std::string(retry_after_0, arraysize(retry_after_0));
+ return std::string(retry_after_0, base::size(retry_after_0));
}
}
@@ -467,7 +465,7 @@
"HTTP/1.1 200 OK\n"
"Content-type: text/cache-manifest\n"
"\n";
- return std::string(headers, arraysize(headers));
+ return std::string(headers, base::size(headers));
}
static std::string data() {
@@ -1785,7 +1783,7 @@
"HTTP/1.1 200 OK\0"
"Last-Modified: Sat, 29 Oct 1994 19:43:31 GMT\0"
"\0";
- const std::string kRawHeaders(kData, arraysize(kData));
+ const std::string kRawHeaders(kData, base::size(kData));
MakeAppCacheResponseInfo(kManifestUrl, 444, kRawHeaders);
MakeAppCacheResponseInfo(kManifestUrl, 555, kRawHeaders);
@@ -2222,7 +2220,7 @@
"Content-type: text/cache-manifest\0"
"Last-Modified: Sat, 29 Oct 1994 19:43:31 GMT\0"
"\0";
- const std::string kRawHeaders(kData, arraysize(kData));
+ const std::string kRawHeaders(kData, base::size(kData));
MakeAppCacheResponseInfo(kManifestUrl, kManifestResponseId, kRawHeaders);
group_ = new AppCacheGroup(
@@ -3077,7 +3075,7 @@
"HTTP/1.1 200 OK\0"
"\0";
net::HttpResponseHeaders* headers =
- new net::HttpResponseHeaders(std::string(data, arraysize(data)));
+ new net::HttpResponseHeaders(std::string(data, base::size(data)));
net::HttpResponseInfo* response_info = new net::HttpResponseInfo();
response_info->headers = headers; // adds ref to headers
@@ -3129,7 +3127,7 @@
"Last-Modified: Sat, 29 Oct 1994 19:43:31 GMT\0"
"\0";
net::HttpResponseHeaders* headers2 =
- new net::HttpResponseHeaders(std::string(data2, arraysize(data2)));
+ new net::HttpResponseHeaders(std::string(data2, base::size(data2)));
net::HttpResponseInfo* response_info = new net::HttpResponseInfo();
response_info->headers = headers2;
@@ -3336,7 +3334,7 @@
"ETag: \"LadeDade\"\0"
"\0";
net::HttpResponseHeaders* headers =
- new net::HttpResponseHeaders(std::string(data, arraysize(data)));
+ new net::HttpResponseHeaders(std::string(data, base::size(data)));
net::HttpResponseInfo* response_info = new net::HttpResponseInfo();
response_info->headers = headers; // adds ref to headers
@@ -3390,7 +3388,7 @@
"ETag: \"LadeDade\"\0"
"\0";
net::HttpResponseHeaders* headers =
- new net::HttpResponseHeaders(std::string(data, arraysize(data)));
+ new net::HttpResponseHeaders(std::string(data, base::size(data)));
net::HttpResponseInfo* response_info = new net::HttpResponseInfo();
response_info->headers = headers; // adds ref to headers
diff --git a/content/browser/appcache/appcache_url_request_job_unittest.cc b/content/browser/appcache/appcache_url_request_job_unittest.cc
index a373b78..6135fad 100644
--- a/content/browser/appcache/appcache_url_request_job_unittest.cc
+++ b/content/browser/appcache/appcache_url_request_job_unittest.cc
@@ -17,11 +17,11 @@
#include "base/containers/stack.h"
#include "base/location.h"
#include "base/logging.h"
-#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "base/message_loop/message_loop.h"
#include "base/pickle.h"
#include "base/single_thread_task_runner.h"
+#include "base/stl_util.h"
#include "base/synchronization/waitable_event.h"
#include "base/test/scoped_task_environment.h"
#include "base/threading/thread.h"
@@ -341,7 +341,7 @@
void WriteBasicResponse() {
scoped_refptr<IOBuffer> body =
base::MakeRefCounted<WrappedIOBuffer>(kHttpBasicBody);
- std::string raw_headers(kHttpBasicHeaders, arraysize(kHttpBasicHeaders));
+ std::string raw_headers(kHttpBasicHeaders, base::size(kHttpBasicHeaders));
WriteResponse(
MakeHttpResponseInfo(raw_headers), body.get(), strlen(kHttpBasicBody));
}
@@ -709,7 +709,7 @@
char* p = body->data();
for (int i = 0; i < 3; ++i, p += kBlockSize)
FillData(i + 1, p, kBlockSize);
- std::string raw_headers(kHttpHeaders, arraysize(kHttpHeaders));
+ std::string raw_headers(kHttpHeaders, base::size(kHttpHeaders));
WriteResponse(
MakeHttpResponseInfo(raw_headers), body.get(), kBlockSize * 3);
}
diff --git a/content/browser/blob_storage/blob_url_unittest.cc b/content/browser/blob_storage/blob_url_unittest.cc
index 283ded19..a63695e9 100644
--- a/content/browser/blob_storage/blob_url_unittest.cc
+++ b/content/browser/blob_storage/blob_url_unittest.cc
@@ -11,10 +11,10 @@
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
-#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/numerics/safe_conversions.h"
#include "base/run_loop.h"
+#include "base/stl_util.h"
#include "base/threading/thread_task_runner_handle.h"
#include "base/time/time.h"
#include "content/browser/url_loader_factory_getter.h"
@@ -169,17 +169,17 @@
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
temp_file1_ = temp_dir_.GetPath().AppendASCII("BlobFile1.dat");
- ASSERT_EQ(static_cast<int>(arraysize(kTestFileData1) - 1),
+ ASSERT_EQ(static_cast<int>(base::size(kTestFileData1) - 1),
base::WriteFile(temp_file1_, kTestFileData1,
- arraysize(kTestFileData1) - 1));
+ base::size(kTestFileData1) - 1));
base::File::Info file_info1;
base::GetFileInfo(temp_file1_, &file_info1);
temp_file_modification_time1_ = file_info1.last_modified;
temp_file2_ = temp_dir_.GetPath().AppendASCII("BlobFile2.dat");
- ASSERT_EQ(static_cast<int>(arraysize(kTestFileData2) - 1),
+ ASSERT_EQ(static_cast<int>(base::size(kTestFileData2) - 1),
base::WriteFile(temp_file2_, kTestFileData2,
- arraysize(kTestFileData2) - 1));
+ base::size(kTestFileData2) - 1));
base::File::Info file_info2;
base::GetFileInfo(temp_file2_, &file_info2);
temp_file_modification_time2_ = file_info2.last_modified;
@@ -217,12 +217,12 @@
const char kFilename1[] = "FileSystemFile1.dat";
temp_file_system_file1_ = GetFileSystemURL(kFilename1);
WriteFileSystemFile(kFilename1, kTestFileSystemFileData1,
- arraysize(kTestFileSystemFileData1) - 1,
+ base::size(kTestFileSystemFileData1) - 1,
&temp_file_system_file_modification_time1_);
const char kFilename2[] = "FileSystemFile2.dat";
temp_file_system_file2_ = GetFileSystemURL(kFilename2);
WriteFileSystemFile(kFilename2, kTestFileSystemFileData2,
- arraysize(kTestFileSystemFileData2) - 1,
+ base::size(kTestFileSystemFileData2) - 1,
&temp_file_system_file_modification_time2_);
}
@@ -443,13 +443,13 @@
TEST_P(BlobURLRequestJobTest, TestGetSimpleDataRequest) {
blob_data_->AppendData(kTestData1);
- TestSuccessNonrangeRequest(kTestData1, arraysize(kTestData1) - 1);
+ TestSuccessNonrangeRequest(kTestData1, base::size(kTestData1) - 1);
}
TEST_P(BlobURLRequestJobTest, TestGetSimpleFileRequest) {
blob_data_->AppendFile(temp_file1_, 0, std::numeric_limits<uint64_t>::max(),
base::Time());
- TestSuccessNonrangeRequest(kTestFileData1, arraysize(kTestFileData1) - 1);
+ TestSuccessNonrangeRequest(kTestFileData1, base::size(kTestFileData1) - 1);
}
TEST_P(BlobURLRequestJobTest, TestGetLargeFileRequest) {
@@ -494,7 +494,7 @@
std::numeric_limits<uint64_t>::max(),
base::Time(), file_system_context_);
TestSuccessNonrangeRequest(kTestFileSystemFileData1,
- arraysize(kTestFileSystemFileData1) - 1);
+ base::size(kTestFileSystemFileData1) - 1);
}
TEST_P(BlobURLRequestJobTest, TestGetLargeFileSystemFileRequest) {
@@ -554,7 +554,7 @@
disk_cache_entry_.get(),
kTestDiskCacheStreamIndex);
TestSuccessNonrangeRequest(kTestDiskCacheData1,
- arraysize(kTestDiskCacheData1) - 1);
+ base::size(kTestDiskCacheData1) - 1);
}
TEST_P(BlobURLRequestJobTest, TestGetComplicatedDataFileAndDiskCacheRequest) {
@@ -658,7 +658,7 @@
expected_status_code_ = 200;
expected_response_ = kTestDiskCacheData2;
TestRequest("GET", net::HttpRequestHeaders());
- EXPECT_EQ(static_cast<int>(arraysize(kTestDiskCacheData2) - 1),
+ EXPECT_EQ(static_cast<int>(base::size(kTestDiskCacheData2) - 1),
response_headers_->GetContentLength());
EXPECT_EQ(std::string(kTestDiskCacheSideData), response_metadata_);
@@ -675,7 +675,7 @@
expected_status_code_ = 200;
expected_response_ = kTestDiskCacheData2;
TestRequest("GET", net::HttpRequestHeaders());
- EXPECT_EQ(static_cast<int>(arraysize(kTestDiskCacheData2) - 1),
+ EXPECT_EQ(static_cast<int>(base::size(kTestDiskCacheData2) - 1),
response_headers_->GetContentLength());
EXPECT_TRUE(response_metadata_.empty());
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index a43a30d..43a33d7 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -33,6 +33,7 @@
#include "base/process/process_metrics.h"
#include "base/run_loop.h"
#include "base/single_thread_task_runner.h"
+#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
#include "base/synchronization/waitable_event.h"
@@ -291,7 +292,7 @@
// Register GLib-handled assertions to go through our logging system.
const char* const kLogDomains[] =
{ nullptr, "Gtk", "Gdk", "GLib", "GLib-GObject" };
- for (size_t i = 0; i < arraysize(kLogDomains); i++) {
+ for (size_t i = 0; i < base::size(kLogDomains); i++) {
g_log_set_handler(
kLogDomains[i],
static_cast<GLogLevelFlags>(G_LOG_FLAG_RECURSION | G_LOG_FLAG_FATAL |
diff --git a/content/browser/browser_url_handler_impl.cc b/content/browser/browser_url_handler_impl.cc
index d75e689..5f6d1f2 100644
--- a/content/browser/browser_url_handler_impl.cc
+++ b/content/browser/browser_url_handler_impl.cc
@@ -6,7 +6,7 @@
#include <stddef.h>
-#include "base/macros.h"
+#include "base/stl_util.h"
#include "base/strings/string_util.h"
#include "content/browser/frame_host/debug_urls.h"
#include "content/browser/webui/web_ui_impl.h"
@@ -37,7 +37,7 @@
// Merge all the schemes for which view-source is allowed by default, with
// the view-source schemes defined by the ContentBrowserClient.
std::vector<std::string> all_allowed_sub_schemes;
- for (size_t i = 0; i < arraysize(default_allowed_sub_schemes); ++i)
+ for (size_t i = 0; i < base::size(default_allowed_sub_schemes); ++i)
all_allowed_sub_schemes.push_back(default_allowed_sub_schemes[i]);
GetContentClient()->browser()->GetAdditionalViewSourceSchemes(
&all_allowed_sub_schemes);
diff --git a/content/browser/browsing_data/clear_site_data_throttle_unittest.cc b/content/browser/browsing_data/clear_site_data_throttle_unittest.cc
index 4630b9c..024f339 100644
--- a/content/browser/browsing_data/clear_site_data_throttle_unittest.cc
+++ b/content/browser/browsing_data/clear_site_data_throttle_unittest.cc
@@ -8,6 +8,7 @@
#include "base/memory/ref_counted.h"
#include "base/run_loop.h"
+#include "base/stl_util.h"
#include "base/strings/stringprintf.h"
#include "base/task/post_task.h"
#include "base/test/scoped_command_line.h"
@@ -626,7 +627,7 @@
bool defer;
throttle->WillStartRequest(&defer);
- for (size_t i = 0; i < arraysize(kTestCases); i++) {
+ for (size_t i = 0; i < base::size(kTestCases); i++) {
throttle->SetResponseHeaders(std::string(kClearSiteDataHeaderPrefix) +
kTestCases[i].header);
@@ -635,7 +636,7 @@
throttle->SetCurrentURLForTesting(GURL(kTestCases[i].url));
net::RedirectInfo redirect_info;
- if (i < arraysize(kTestCases) - 1)
+ if (i < base::size(kTestCases) - 1)
throttle->WillRedirectRequest(redirect_info, &defer);
else
throttle->WillProcessResponse(&defer);
diff --git a/content/browser/devtools/devtools_io_context.cc b/content/browser/devtools/devtools_io_context.cc
index 02bc1fa..f7c4a2b 100644
--- a/content/browser/devtools/devtools_io_context.cc
+++ b/content/browser/devtools/devtools_io_context.cc
@@ -6,6 +6,7 @@
#include "base/bind.h"
#include "base/sequenced_task_runner.h"
+#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
#include "content/browser/blob_storage/chrome_blob_storage_context.h"
#include "content/browser/devtools/devtools_stream_blob.h"
@@ -66,7 +67,7 @@
static const char* kTextMIMETypePrefixes[] = {
"text/", "application/x-javascript", "application/json",
"application/xml"};
- for (size_t i = 0; i < arraysize(kTextMIMETypePrefixes); ++i) {
+ for (size_t i = 0; i < base::size(kTextMIMETypePrefixes); ++i) {
if (base::StartsWith(mime_type, kTextMIMETypePrefixes[i],
base::CompareCase::INSENSITIVE_ASCII))
return true;
diff --git a/content/browser/devtools/protocol/schema_handler.cc b/content/browser/devtools/protocol/schema_handler.cc
index e466bc93..938fcc6 100644
--- a/content/browser/devtools/protocol/schema_handler.cc
+++ b/content/browser/devtools/protocol/schema_handler.cc
@@ -4,6 +4,8 @@
#include "content/browser/devtools/protocol/schema_handler.h"
+#include "base/stl_util.h"
+
namespace content {
namespace protocol {
@@ -33,7 +35,7 @@
"HeapProfiler", "Schema", "Target", "Overlay",
"Performance", "Audits", "HeadlessExperimental"};
*domains = protocol::Array<Schema::Domain>::create();
- for (size_t i = 0; i < arraysize(kDomains); ++i) {
+ for (size_t i = 0; i < base::size(kDomains); ++i) {
(*domains)->addItem(Schema::Domain::Create()
.SetName(kDomains[i])
.SetVersion(kVersion)
diff --git a/content/browser/download/save_package_unittest.cc b/content/browser/download/save_package_unittest.cc
index 4494255..e8e916e 100644
--- a/content/browser/download/save_package_unittest.cc
+++ b/content/browser/download/save_package_unittest.cc
@@ -9,8 +9,8 @@
#include "base/files/file_path.h"
#include "base/files/scoped_temp_dir.h"
-#include "base/macros.h"
#include "base/run_loop.h"
+#include "base/stl_util.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "build/build_config.h"
@@ -194,7 +194,7 @@
};
TEST_F(SavePackageTest, TestSuccessfullyGenerateSavePackageFilename) {
- for (size_t i = 0; i < arraysize(kGeneratedFiles); ++i) {
+ for (size_t i = 0; i < base::size(kGeneratedFiles); ++i) {
base::FilePath::StringType file_name;
bool ok = GetGeneratedFilename(true,
kGeneratedFiles[i].disposition,
@@ -207,7 +207,7 @@
}
TEST_F(SavePackageTest, TestUnSuccessfullyGenerateSavePackageFilename) {
- for (size_t i = 0; i < arraysize(kGeneratedFiles); ++i) {
+ for (size_t i = 0; i < base::size(kGeneratedFiles); ++i) {
base::FilePath::StringType file_name;
bool ok = GetGeneratedFilename(false,
kGeneratedFiles[i].disposition,
diff --git a/content/browser/frame_host/navigation_controller_impl_unittest.cc b/content/browser/frame_host/navigation_controller_impl_unittest.cc
index e22d7d50..364fe0d 100644
--- a/content/browser/frame_host/navigation_controller_impl_unittest.cc
+++ b/content/browser/frame_host/navigation_controller_impl_unittest.cc
@@ -14,7 +14,6 @@
#include "base/bind.h"
#include "base/files/file_util.h"
-#include "base/macros.h"
#include "base/memory/ptr_util.h"
#include "base/stl_util.h"
#include "base/strings/string_util.h"
@@ -4385,7 +4384,7 @@
const GURL kInitialUrl("http://site3.com");
std::vector<std::unique_ptr<NavigationEntry>> entries;
- for (size_t i = 0; i < arraysize(kRestoredUrls); ++i) {
+ for (size_t i = 0; i < base::size(kRestoredUrls); ++i) {
std::unique_ptr<NavigationEntry> entry =
NavigationController::CreateNavigationEntry(
kRestoredUrls[i], Referrer(), ui::PAGE_TRANSITION_RELOAD, false,
diff --git a/content/browser/frame_host/navigator_impl_unittest.cc b/content/browser/frame_host/navigator_impl_unittest.cc
index e69a9ff3..f7ea8cd6 100644
--- a/content/browser/frame_host/navigator_impl_unittest.cc
+++ b/content/browser/frame_host/navigator_impl_unittest.cc
@@ -5,7 +5,7 @@
#include <stdint.h>
#include "base/feature_list.h"
-#include "base/macros.h"
+#include "base/stl_util.h"
#include "base/time/time.h"
#include "build/build_config.h"
#include "content/browser/frame_host/navigation_controller_impl.h"
@@ -389,7 +389,7 @@
new network::ResourceResponse);
const char kNoContentHeaders[] = "HTTP/1.1 204 No Content\0\0";
response->head.headers = new net::HttpResponseHeaders(
- std::string(kNoContentHeaders, arraysize(kNoContentHeaders)));
+ std::string(kNoContentHeaders, base::size(kNoContentHeaders)));
GetLoaderForNavigationRequest(main_request)
->CallOnResponseStarted(response, nullptr);
@@ -414,7 +414,7 @@
response = new network::ResourceResponse;
const char kResetContentHeaders[] = "HTTP/1.1 205 Reset Content\0\0";
response->head.headers = new net::HttpResponseHeaders(
- std::string(kResetContentHeaders, arraysize(kResetContentHeaders)));
+ std::string(kResetContentHeaders, base::size(kResetContentHeaders)));
GetLoaderForNavigationRequest(main_request)
->CallOnResponseStarted(response, nullptr);
diff --git a/content/browser/gpu/compositor_util.cc b/content/browser/gpu/compositor_util.cc
index fe65297..931c1b7 100644
--- a/content/browser/gpu/compositor_util.cc
+++ b/content/browser/gpu/compositor_util.cc
@@ -13,9 +13,9 @@
#include "base/command_line.h"
#include "base/feature_list.h"
#include "base/logging.h"
-#include "base/macros.h"
#include "base/metrics/field_trial.h"
#include "base/numerics/ranges.h"
+#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
#include "base/system/sys_info.h"
@@ -210,8 +210,8 @@
!features::IsUsingSkiaRenderer(),
"Skia renderer is not used by default.", false, false},
};
- DCHECK(index < arraysize(kGpuFeatureData));
- *eof = (index == arraysize(kGpuFeatureData) - 1);
+ DCHECK(index < base::size(kGpuFeatureData));
+ *eof = (index == base::size(kGpuFeatureData) - 1);
return kGpuFeatureData[index];
}
diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc
index f157872..de98ea5 100644
--- a/content/browser/gpu/gpu_process_host.cc
+++ b/content/browser/gpu/gpu_process_host.cc
@@ -17,13 +17,13 @@
#include "base/command_line.h"
#include "base/feature_list.h"
#include "base/logging.h"
-#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/message_loop/message_loop.h"
#include "base/metrics/field_trial.h"
#include "base/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros.h"
#include "base/no_destructor.h"
+#include "base/stl_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/task/post_task.h"
#include "base/threading/thread.h"
@@ -567,7 +567,7 @@
return;
}
bool has_gpu = false;
- for (size_t i = 0; i < arraysize(g_gpu_process_hosts); ++i) {
+ for (size_t i = 0; i < base::size(g_gpu_process_hosts); ++i) {
GpuProcessHost* host = g_gpu_process_hosts[i];
if (host && ValidateHost(host)) {
has_gpu = true;
@@ -1077,7 +1077,7 @@
// If you want a browser command-line switch passed to the GPU process
// you need to add it to |kSwitchNames| at the beginning of this file.
cmd_line->CopySwitchesFrom(browser_command_line, kSwitchNames,
- arraysize(kSwitchNames));
+ base::size(kSwitchNames));
cmd_line->CopySwitchesFrom(
browser_command_line, switches::kGLSwitchesCopiedFromGpuProcessHost,
switches::kGLSwitchesCopiedFromGpuProcessHostNumSwitches);
diff --git a/content/browser/host_zoom_map_impl_unittest.cc b/content/browser/host_zoom_map_impl_unittest.cc
index dd9d86d..15602c0b 100644
--- a/content/browser/host_zoom_map_impl_unittest.cc
+++ b/content/browser/host_zoom_map_impl_unittest.cc
@@ -6,8 +6,8 @@
#include <stddef.h>
-#include "base/macros.h"
#include "base/memory/ref_counted.h"
+#include "base/stl_util.h"
#include "base/test/simple_test_clock.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -72,8 +72,8 @@
zoomed},
{HostZoomMap::ZOOM_CHANGED_FOR_SCHEME_AND_HOST, "zoomed.com", "https",
zoomed}, };
- ASSERT_EQ(arraysize(expected), levels.size());
- for (size_t i = 0; i < arraysize(expected); ++i) {
+ ASSERT_EQ(base::size(expected), levels.size());
+ for (size_t i = 0; i < base::size(expected); ++i) {
SCOPED_TRACE(testing::Message() << "levels[" << i << "]");
EXPECT_EQ(expected[i].mode, levels[i].mode);
EXPECT_EQ(expected[i].scheme, levels[i].scheme);
@@ -108,8 +108,8 @@
{HostZoomMap::ZOOM_CHANGED_FOR_SCHEME_AND_HOST, "login", "chrome", 3.0,
base::Time()},
};
- ASSERT_EQ(arraysize(expected), levels.size());
- for (size_t i = 0; i < arraysize(expected); ++i) {
+ ASSERT_EQ(base::size(expected), levels.size());
+ for (size_t i = 0; i < base::size(expected); ++i) {
SCOPED_TRACE(testing::Message() << "levels[" << i << "]");
EXPECT_EQ(expected[i].mode, levels[i].mode);
EXPECT_EQ(expected[i].scheme, levels[i].scheme);
diff --git a/content/browser/loader/intercepting_resource_handler_unittest.cc b/content/browser/loader/intercepting_resource_handler_unittest.cc
index 7d1f336..4ad5954 100644
--- a/content/browser/loader/intercepting_resource_handler_unittest.cc
+++ b/content/browser/loader/intercepting_resource_handler_unittest.cc
@@ -12,9 +12,9 @@
#include "base/files/file_path.h"
#include "base/location.h"
#include "base/logging.h"
-#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "base/single_thread_task_runner.h"
+#include "base/stl_util.h"
#include "base/threading/thread_task_runner_handle.h"
#include "content/browser/loader/mock_resource_loader.h"
#include "content/browser/loader/resource_controller.h"
@@ -371,7 +371,7 @@
const char kPayload[] = "The long long long long long payload";
// This should be less than half the size of the payload, so it needs at least
// 3 reads to receive.
- const int kOldHandlerBufferSize = arraysize(kPayload) / 3;
+ const int kOldHandlerBufferSize = base::size(kPayload) / 3;
// When sending a payload to the old ResourceHandler, the
// InterceptingResourceHandler doesn't send a final EOF read.
diff --git a/content/browser/loader/resource_loader_unittest.cc b/content/browser/loader/resource_loader_unittest.cc
index c23f737..2b9ec1ba 100644
--- a/content/browser/loader/resource_loader_unittest.cc
+++ b/content/browser/loader/resource_loader_unittest.cc
@@ -13,12 +13,12 @@
#include "base/containers/circular_deque.h"
#include "base/location.h"
-#include "base/macros.h"
#include "base/memory/ptr_util.h"
#include "base/memory/weak_ptr.h"
#include "base/metrics/statistics_recorder.h"
#include "base/run_loop.h"
#include "base/single_thread_task_runner.h"
+#include "base/stl_util.h"
#include "base/threading/thread_task_runner_handle.h"
#include "content/browser/loader/resource_loader_delegate.h"
#include "content/browser/loader/test_resource_handler.h"
@@ -251,7 +251,7 @@
net::URLRequest* request,
net::NetworkDelegate* network_delegate) const override {
std::string headers =
- redirect_ ? std::string(kRedirectHeaders, arraysize(kRedirectHeaders))
+ redirect_ ? std::string(kRedirectHeaders, base::size(kRedirectHeaders))
: net::URLRequestTestJob::test_headers();
return new MockHTTPSURLRequestJob(request, network_delegate, headers,
"dummy response", true);
diff --git a/content/browser/loader/upload_data_stream_builder_unittest.cc b/content/browser/loader/upload_data_stream_builder_unittest.cc
index 6f38daee..05e15622 100644
--- a/content/browser/loader/upload_data_stream_builder_unittest.cc
+++ b/content/browser/loader/upload_data_stream_builder_unittest.cc
@@ -11,8 +11,8 @@
#include "base/files/file_path.h"
#include "base/files/file_util.h"
-#include "base/macros.h"
#include "base/run_loop.h"
+#include "base/stl_util.h"
#include "base/test/scoped_task_environment.h"
#include "base/threading/thread_task_runner_handle.h"
#include "base/time/time.h"
@@ -58,7 +58,7 @@
std::unique_ptr<BlobDataHandle> handle =
context.AddFinishedBlob(std::move(builder));
- request_body->AppendBytes(kData, arraysize(kData) - 1);
+ request_body->AppendBytes(kData, base::size(kData) - 1);
request_body->AppendFileRange(base::FilePath(kFilePath), kFileOffset,
kFileLength, kFileTime);
request_body->AppendBlob(kBlob);
diff --git a/content/browser/media/media_internals.cc b/content/browser/media/media_internals.cc
index f626c60..6016791 100644
--- a/content/browser/media/media_internals.cc
+++ b/content/browser/media/media_internals.cc
@@ -11,7 +11,6 @@
#include "base/containers/adapters.h"
#include "base/feature_list.h"
-#include "base/macros.h"
#include "base/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros.h"
#include "base/stl_util.h"
@@ -67,7 +66,7 @@
};
std::string ret;
- for (size_t i = 0; i < arraysize(flags); ++i) {
+ for (size_t i = 0; i < base::size(flags); ++i) {
if (effects & flags[i].flag) {
if (!ret.empty())
ret += " | ";
diff --git a/content/browser/notifications/notification_database_unittest.cc b/content/browser/notifications/notification_database_unittest.cc
index 8f0978c..7bdbf34 100644
--- a/content/browser/notifications/notification_database_unittest.cc
+++ b/content/browser/notifications/notification_database_unittest.cc
@@ -9,7 +9,7 @@
#include "base/files/scoped_temp_dir.h"
#include "base/guid.h"
-#include "base/macros.h"
+#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "content/public/browser/notification_database_data.h"
@@ -82,7 +82,7 @@
// their origin and Service Worker registration id.
void PopulateDatabaseWithExampleData(NotificationDatabase* database) {
std::string notification_id;
- for (size_t i = 0; i < arraysize(kExampleNotificationData); ++i) {
+ for (size_t i = 0; i < base::size(kExampleNotificationData); ++i) {
ASSERT_NO_FATAL_FAILURE(CreateAndWriteNotification(
database, GURL(kExampleNotificationData[i].origin),
kExampleNotificationData[i].tag,
@@ -504,7 +504,7 @@
ASSERT_EQ(NotificationDatabase::STATUS_OK,
database->ReadAllNotificationData(¬ifications));
- EXPECT_EQ(arraysize(kExampleNotificationData), notifications.size());
+ EXPECT_EQ(base::size(kExampleNotificationData), notifications.size());
}
TEST_F(NotificationDatabaseTest, ReadAllNotificationDataEmpty) {
diff --git a/content/browser/ppapi_plugin_process_host.cc b/content/browser/ppapi_plugin_process_host.cc
index ed82bb98..d7d70e9a 100644
--- a/content/browser/ppapi_plugin_process_host.cc
+++ b/content/browser/ppapi_plugin_process_host.cc
@@ -12,8 +12,8 @@
#include "base/base_switches.h"
#include "base/command_line.h"
#include "base/files/file_path.h"
-#include "base/macros.h"
#include "base/metrics/field_trial.h"
+#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "build/build_config.h"
@@ -372,7 +372,7 @@
switches::kVModule
};
cmd_line->CopySwitchesFrom(browser_command_line, kCommonForwardSwitches,
- arraysize(kCommonForwardSwitches));
+ base::size(kCommonForwardSwitches));
if (!is_broker_) {
static const char* const kPluginForwardSwitches[] = {
@@ -384,7 +384,7 @@
switches::kPpapiStartupDialog,
};
cmd_line->CopySwitchesFrom(browser_command_line, kPluginForwardSwitches,
- arraysize(kPluginForwardSwitches));
+ base::size(kPluginForwardSwitches));
// Copy any flash args over if necessary.
// TODO(vtl): Stop passing flash args in the command line, or windows is
diff --git a/content/browser/renderer_host/dwrite_font_proxy_message_filter_win.cc b/content/browser/renderer_host/dwrite_font_proxy_message_filter_win.cc
index 7aa4947..95cb8c4 100644
--- a/content/browser/renderer_host/dwrite_font_proxy_message_filter_win.cc
+++ b/content/browser/renderer_host/dwrite_font_proxy_message_filter_win.cc
@@ -16,9 +16,9 @@
#include "base/feature_list.h"
#include "base/i18n/case_conversion.h"
#include "base/logging.h"
-#include "base/macros.h"
#include "base/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros.h"
+#include "base/stl_util.h"
#include "base/strings/string16.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
@@ -597,7 +597,7 @@
}
// Temp code to help track down crbug.com/561873
- for (size_t font = 0; font < arraysize(kLastResortFontNames); font++) {
+ for (size_t font = 0; font < base::size(kLastResortFontNames); font++) {
uint32_t font_index = 0;
BOOL exists = FALSE;
if (SUCCEEDED(collection_->FindFamilyName(kLastResortFontNames[font],
diff --git a/content/browser/renderer_host/input/input_router_impl_unittest.cc b/content/browser/renderer_host/input/input_router_impl_unittest.cc
index 5cb1cb8..2f8b369e 100644
--- a/content/browser/renderer_host/input/input_router_impl_unittest.cc
+++ b/content/browser/renderer_host/input/input_router_impl_unittest.cc
@@ -14,9 +14,9 @@
#include "base/command_line.h"
#include "base/location.h"
-#include "base/macros.h"
#include "base/run_loop.h"
#include "base/single_thread_task_runner.h"
+#include "base/stl_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/scoped_feature_list.h"
#include "base/test/scoped_task_environment.h"
@@ -952,7 +952,7 @@
WebInputEvent::kGestureScrollBegin, WebInputEvent::kGestureScrollUpdate,
WebInputEvent::kGesturePinchBegin, WebInputEvent::kGesturePinchUpdate,
WebInputEvent::kGesturePinchEnd, WebInputEvent::kGestureScrollEnd};
- for (size_t i = 0; i < arraysize(eventTypes); ++i) {
+ for (size_t i = 0; i < base::size(eventTypes); ++i) {
WebInputEvent::Type type = eventTypes[i];
if (ShouldBlockEventStream(GetEventWithType(type))) {
PressAndSetTouchActionAuto();
@@ -1046,7 +1046,7 @@
WebInputEvent::kGesturePinchUpdate,
WebInputEvent::kTouchStart,
WebInputEvent::kTouchMove};
- for (size_t i = 0; i < arraysize(kRequiredEventAckTypes); ++i) {
+ for (size_t i = 0; i < base::size(kRequiredEventAckTypes); ++i) {
const WebInputEvent::Type required_ack_type = kRequiredEventAckTypes[i];
ASSERT_TRUE(ShouldBlockEventStream(GetEventWithType(required_ack_type)));
}
diff --git a/content/browser/renderer_host/input/motion_event_web_unittest.cc b/content/browser/renderer_host/input/motion_event_web_unittest.cc
index bf31318a..6f36e8a 100644
--- a/content/browser/renderer_host/input/motion_event_web_unittest.cc
+++ b/content/browser/renderer_host/input/motion_event_web_unittest.cc
@@ -5,6 +5,7 @@
#include <stddef.h>
#include "base/numerics/math_constants.h"
+#include "base/stl_util.h"
#include "content/browser/renderer_host/input/motion_event_web.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/events/blink/blink_event_util.h"
@@ -32,7 +33,7 @@
PointerProperties pp;
MotionEventGeneric generic_event(MotionEvent::Action::MOVE, event_time, pp);
for (MotionEvent::ToolType tool_type : tool_types) {
- for (size_t i = 0; i < arraysize(tilts_x); ++i) {
+ for (size_t i = 0; i < base::size(tilts_x); ++i) {
const float tilt_x = tilts_x[i];
const float tilt_y = tilts_y[i];
const float orientation = orientations[i];
@@ -84,7 +85,7 @@
}
generic_event.RemovePointerAt(pointer_index);
- }
+ }
}
}
diff --git a/content/browser/renderer_host/input/web_input_event_builders_mac_unittest.mm b/content/browser/renderer_host/input/web_input_event_builders_mac_unittest.mm
index b0a397f1..61d9010 100644
--- a/content/browser/renderer_host/input/web_input_event_builders_mac_unittest.mm
+++ b/content/browser/renderer_host/input/web_input_event_builders_mac_unittest.mm
@@ -8,7 +8,7 @@
#import <Cocoa/Cocoa.h>
#include <stddef.h>
-#include "base/macros.h"
+#include "base/stl_util.h"
#include "testing/gtest/include/gtest/gtest.h"
#import "ui/events/cocoa/cocoa_event_utils.h"
#include "ui/events/event.h"
@@ -185,7 +185,7 @@
ui::DomKey::FromCharacter('9')},
};
- for (size_t i = 0; i < arraysize(table); ++i) {
+ for (size_t i = 0; i < base::size(table); ++i) {
NSEvent* mac_event = BuildFakeKeyEvent(table[i].mac_key_code,
table[i].character, 0, NSKeyDown);
WebKeyboardEvent web_event = WebKeyboardEventBuilder::Build(mac_event);
@@ -198,7 +198,7 @@
// Test that left- and right-hand modifier keys are interpreted correctly when
// pressed simultaneously.
TEST(WebInputEventFactoryTestMac, SimultaneousModifierKeys) {
- for (size_t i = 0; i < arraysize(kModifierKeys) / 2; ++i) {
+ for (size_t i = 0; i < base::size(kModifierKeys) / 2; ++i) {
const ModifierKey& left = kModifierKeys[2 * i];
const ModifierKey& right = kModifierKeys[2 * i + 1];
// Press the left key.
@@ -229,7 +229,7 @@
// Test that individual modifier keys are still reported correctly, even if the
// undocumented left- or right-hand flags are not set.
TEST(WebInputEventBuilderMacTest, MissingUndocumentedModifierFlags) {
- for (size_t i = 0; i < arraysize(kModifierKeys); ++i) {
+ for (size_t i = 0; i < base::size(kModifierKeys); ++i) {
const ModifierKey& key = kModifierKeys[i];
NSEvent* mac_event = BuildFakeKeyEvent(
key.mac_key_code, 0, key.non_specific_mask, NSFlagsChanged);
diff --git a/content/browser/renderer_host/media/media_stream_manager.cc b/content/browser/renderer_host/media/media_stream_manager.cc
index a722c5ba..53d03af 100644
--- a/content/browser/renderer_host/media/media_stream_manager.cc
+++ b/content/browser/renderer_host/media/media_stream_manager.cc
@@ -17,9 +17,9 @@
#include "base/compiler_specific.h"
#include "base/lazy_instance.h"
#include "base/logging.h"
-#include "base/macros.h"
#include "base/power_monitor/power_monitor.h"
#include "base/rand_util.h"
+#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
@@ -102,8 +102,8 @@
static const size_t kRfc4122LengthLabel = 36u;
std::string label(kRfc4122LengthLabel, ' ');
for (char& c : label) {
- // Use |arraysize(kAlphabet) - 1| to avoid |kAlphabet|s terminating '\0';
- c = kAlphabet[base::RandGenerator(arraysize(kAlphabet) - 1)];
+ // Use |base::size(kAlphabet) - 1| to avoid |kAlphabet|s terminating '\0';
+ c = kAlphabet[base::RandGenerator(base::size(kAlphabet) - 1)];
DCHECK(std::isalnum(c)) << c;
}
return label;
@@ -1655,7 +1655,7 @@
bool requested[] = {requested_audio_input, requested_video_input};
MediaStreamType stream_types[] = {MEDIA_DEVICE_AUDIO_CAPTURE,
MEDIA_DEVICE_VIDEO_CAPTURE};
- for (size_t i = 0; i < arraysize(requested); ++i) {
+ for (size_t i = 0; i < base::size(requested); ++i) {
if (!requested[i])
continue;
diff --git a/content/browser/renderer_host/pepper/pepper_renderer_connection.cc b/content/browser/renderer_host/pepper/pepper_renderer_connection.cc
index 62c9808e..1d60dbc 100644
--- a/content/browser/renderer_host/pepper/pepper_renderer_connection.cc
+++ b/content/browser/renderer_host/pepper/pepper_renderer_connection.cc
@@ -9,8 +9,8 @@
#include <utility>
#include "base/bind.h"
-#include "base/macros.h"
#include "base/memory/ref_counted.h"
+#include "base/stl_util.h"
#include "content/browser/browser_child_process_host_impl.h"
#include "content/browser/ppapi_plugin_process_host.h"
#include "content/browser/renderer_host/pepper/browser_ppapi_host_impl.h"
@@ -96,7 +96,7 @@
PepperRendererConnection::PepperRendererConnection(int render_process_id)
: BrowserMessageFilter(kPepperFilteredMessageClasses,
- arraysize(kPepperFilteredMessageClasses)),
+ base::size(kPepperFilteredMessageClasses)),
render_process_id_(render_process_id) {
// Only give the renderer permission for stable APIs.
in_process_host_.reset(new BrowserPpapiHostImpl(this,
diff --git a/content/browser/renderer_host/pepper/pepper_truetype_font_list_mac.mm b/content/browser/renderer_host/pepper/pepper_truetype_font_list_mac.mm
index c59c4a8..bfaf5ba 100644
--- a/content/browser/renderer_host/pepper/pepper_truetype_font_list_mac.mm
+++ b/content/browser/renderer_host/pepper/pepper_truetype_font_list_mac.mm
@@ -7,7 +7,7 @@
#import <Cocoa/Cocoa.h>
#include "base/mac/scoped_nsautorelease_pool.h"
-#include "base/macros.h"
+#include "base/stl_util.h"
#include "base/strings/sys_string_conversions.h"
#include "ppapi/c/dev/ppb_truetype_font_dev.h"
#include "ppapi/proxy/serialized_structs.h"
@@ -31,7 +31,7 @@
PP_TRUETYPEFONTWEIGHT_ULTRABOLD,
PP_TRUETYPEFONTWEIGHT_HEAVY,
};
-const NSInteger kPepperFontWeightsLength = arraysize(kPepperFontWeights);
+const NSInteger kPepperFontWeightsLength = base::size(kPepperFontWeights);
} // namespace
diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc
index 53b4a977..9d4d674 100644
--- a/content/browser/renderer_host/render_message_filter.cc
+++ b/content/browser/renderer_host/render_message_filter.cc
@@ -14,8 +14,8 @@
#include "base/bind_helpers.h"
#include "base/command_line.h"
#include "base/debug/alias.h"
-#include "base/macros.h"
#include "base/numerics/safe_math.h"
+#include "base/stl_util.h"
#include "base/strings/sys_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/task/post_task.h"
@@ -89,7 +89,7 @@
RenderWidgetHelper* render_widget_helper,
MediaInternals* media_internals)
: BrowserMessageFilter(kRenderFilteredMessageClasses,
- arraysize(kRenderFilteredMessageClasses)),
+ base::size(kRenderFilteredMessageClasses)),
BrowserAssociatedInterface<mojom::RenderMessageFilter>(this, this),
resource_dispatcher_host_(ResourceDispatcherHostImpl::Get()),
resource_context_(browser_context->GetResourceContext()),
@@ -97,7 +97,6 @@
render_process_id_(render_process_id),
media_internals_(media_internals),
weak_ptr_factory_(this) {
-
if (render_widget_helper)
render_widget_helper_->Init(render_process_id_, resource_dispatcher_host_);
}
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index cca56202..7fd819b 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -28,7 +28,6 @@
#include "base/lazy_instance.h"
#include "base/location.h"
#include "base/logging.h"
-#include "base/macros.h"
#include "base/memory/memory_pressure_monitor.h"
#include "base/memory/ptr_util.h"
#include "base/memory/ref_counted.h"
@@ -3137,7 +3136,7 @@
#endif
};
renderer_cmd->CopySwitchesFrom(browser_cmd, kSwitchNames,
- arraysize(kSwitchNames));
+ base::size(kSwitchNames));
BrowserChildProcessHostImpl::CopyFeatureAndFieldTrialFlags(renderer_cmd);
BrowserChildProcessHostImpl::CopyTraceStartupFlags(renderer_cmd);
diff --git a/content/browser/renderer_host/render_widget_host_view_mac_editcommand_helper.mm b/content/browser/renderer_host/render_widget_host_view_mac_editcommand_helper.mm
index 3f089d7..d0e908ba 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac_editcommand_helper.mm
+++ b/content/browser/renderer_host/render_widget_host_view_mac_editcommand_helper.mm
@@ -7,7 +7,7 @@
#import <objc/runtime.h>
#include <stddef.h>
-#include "base/macros.h"
+#include "base/stl_util.h"
#include "content/browser/renderer_host/render_widget_host_impl.h"
#import "content/browser/renderer_host/render_widget_host_view_mac.h"
@@ -181,7 +181,7 @@
RenderWidgetHostViewMacEditCommandHelper::
RenderWidgetHostViewMacEditCommandHelper() {
- for (size_t i = 0; i < arraysize(kEditCommands); ++i) {
+ for (size_t i = 0; i < base::size(kEditCommands); ++i) {
edit_command_set_.insert(kEditCommands[i]);
}
}
@@ -192,7 +192,7 @@
// Dynamically adds Selectors to the aformentioned class.
void RenderWidgetHostViewMacEditCommandHelper::AddEditingSelectorsToClass(
Class klass) {
- for (size_t i = 0; i < arraysize(kEditCommands); ++i) {
+ for (size_t i = 0; i < base::size(kEditCommands); ++i) {
// Append trailing ':' to command name to get selector name.
NSString* sel_str = [NSString stringWithFormat: @"%s:", kEditCommands[i]];
@@ -228,7 +228,7 @@
}
NSArray* RenderWidgetHostViewMacEditCommandHelper::GetEditSelectorNames() {
- size_t num_edit_commands = arraysize(kEditCommands);
+ size_t num_edit_commands = base::size(kEditCommands);
NSMutableArray* ret = [NSMutableArray arrayWithCapacity:num_edit_commands];
for (size_t i = 0; i < num_edit_commands; ++i) {
diff --git a/content/browser/sandbox_ipc_linux.cc b/content/browser/sandbox_ipc_linux.cc
index 22683d6..9756262 100644
--- a/content/browser/sandbox_ipc_linux.cc
+++ b/content/browser/sandbox_ipc_linux.cc
@@ -15,11 +15,11 @@
#include "base/command_line.h"
#include "base/files/scoped_file.h"
#include "base/linux_util.h"
-#include "base/macros.h"
#include "base/memory/shared_memory.h"
#include "base/posix/eintr_wrapper.h"
#include "base/posix/unix_domain_socket.h"
#include "base/process/launch.h"
+#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
#include "content/public/common/content_switches.h"
#include "sandbox/linux/services/libc_interceptor.h"
@@ -43,7 +43,7 @@
int failed_polls = 0;
for (;;) {
const int r =
- HANDLE_EINTR(poll(pfds, arraysize(pfds), -1 /* no timeout */));
+ HANDLE_EINTR(poll(pfds, base::size(pfds), -1 /* no timeout */));
// '0' is not a possible return value with no timeout.
DCHECK_NE(0, r);
if (r < 0) {
diff --git a/content/browser/service_worker/embedded_worker_test_helper.cc b/content/browser/service_worker/embedded_worker_test_helper.cc
index 7b6d1e4e..0adedaf 100644
--- a/content/browser/service_worker/embedded_worker_test_helper.cc
+++ b/content/browser/service_worker/embedded_worker_test_helper.cc
@@ -13,6 +13,7 @@
#include "base/atomic_sequence_num.h"
#include "base/bind.h"
#include "base/run_loop.h"
+#include "base/stl_util.h"
#include "base/threading/thread_task_runner_handle.h"
#include "base/time/time.h"
#include "content/browser/service_worker/embedded_worker_instance.h"
@@ -524,7 +525,7 @@
"Content-Type: application/javascript\0"
"\0";
info.headers =
- new net::HttpResponseHeaders(std::string(data, arraysize(data)));
+ new net::HttpResponseHeaders(std::string(data, base::size(data)));
return info;
}
diff --git a/content/browser/service_worker/service_worker_browsertest.cc b/content/browser/service_worker/service_worker_browsertest.cc
index 5928b82..3d266d6 100644
--- a/content/browser/service_worker/service_worker_browsertest.cc
+++ b/content/browser/service_worker/service_worker_browsertest.cc
@@ -13,11 +13,11 @@
#include "base/callback.h"
#include "base/command_line.h"
#include "base/json/json_reader.h"
-#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/metrics/statistics_recorder.h"
#include "base/run_loop.h"
#include "base/single_thread_task_runner.h"
+#include "base/stl_util.h"
#include "base/strings/string16.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/stringprintf.h"
@@ -407,7 +407,7 @@
"Content-Type: application/javascript\0"
"\0";
info.headers =
- new net::HttpResponseHeaders(std::string(data, arraysize(data)));
+ new net::HttpResponseHeaders(std::string(data, base::size(data)));
return info;
}
diff --git a/content/browser/service_worker/service_worker_cache_writer_unittest.cc b/content/browser/service_worker/service_worker_cache_writer_unittest.cc
index d37f40a40..3afddb09 100644
--- a/content/browser/service_worker/service_worker_cache_writer_unittest.cc
+++ b/content/browser/service_worker/service_worker_cache_writer_unittest.cc
@@ -10,8 +10,8 @@
#include <string>
#include "base/containers/queue.h"
-#include "base/macros.h"
#include "base/memory/ptr_util.h"
+#include "base/stl_util.h"
#include "content/browser/service_worker/service_worker_disk_cache.h"
#include "content/browser/service_worker/service_worker_test_utils.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -378,13 +378,13 @@
"abcdef", "ghijkl", "mnopqr", "stuvwxyz",
};
size_t response_size = 0;
- for (size_t i = 0; i < arraysize(expected_data); ++i)
+ for (size_t i = 0; i < base::size(expected_data); ++i)
response_size += expected_data[i].size();
MockServiceWorkerResponseReader* reader = ExpectReader();
reader->ExpectReadInfoOk(response_size, true);
- for (size_t i = 0; i < arraysize(expected_data); ++i) {
+ for (size_t i = 0; i < base::size(expected_data); ++i) {
reader->ExpectReadDataOk(expected_data[i], true);
}
Initialize(false /* pause_when_not_identical */);
@@ -393,7 +393,7 @@
EXPECT_EQ(net::ERR_IO_PENDING, error);
reader->CompletePendingRead();
- for (size_t i = 0; i < arraysize(expected_data); ++i) {
+ for (size_t i = 0; i < base::size(expected_data); ++i) {
error = WriteData(expected_data[i]);
EXPECT_EQ(net::ERR_IO_PENDING, error);
reader->CompletePendingRead();
diff --git a/content/browser/service_worker/service_worker_database_unittest.cc b/content/browser/service_worker/service_worker_database_unittest.cc
index 90a2b42..305f0ff 100644
--- a/content/browser/service_worker/service_worker_database_unittest.cc
+++ b/content/browser/service_worker/service_worker_database_unittest.cc
@@ -11,7 +11,6 @@
#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
-#include "base/macros.h"
#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/test/metrics/histogram_tester.h"
@@ -261,7 +260,7 @@
EXPECT_EQ(
ServiceWorkerDatabase::STATUS_OK,
database->WriteUncommittedResourceIds(std::set<int64_t>(
- kUncommittedIds, kUncommittedIds + arraysize(kUncommittedIds))));
+ kUncommittedIds, kUncommittedIds + base::size(kUncommittedIds))));
EXPECT_EQ(
ServiceWorkerDatabase::STATUS_OK,
database->GetNextAvailableIds(&ids.reg_id, &ids.ver_id, &ids.res_id));
@@ -273,7 +272,7 @@
const int64_t kPurgeableIds[] = {4, 12, 16, 17, 20};
EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK,
database->WriteUncommittedResourceIds(std::set<int64_t>(
- kPurgeableIds, kPurgeableIds + arraysize(kPurgeableIds))));
+ kPurgeableIds, kPurgeableIds + base::size(kPurgeableIds))));
EXPECT_EQ(
ServiceWorkerDatabase::STATUS_OK,
database->GetNextAvailableIds(&ids.reg_id, &ids.ver_id, &ids.res_id));
diff --git a/content/browser/service_worker/service_worker_job_unittest.cc b/content/browser/service_worker/service_worker_job_unittest.cc
index d7f87bf..b972b61b 100644
--- a/content/browser/service_worker/service_worker_job_unittest.cc
+++ b/content/browser/service_worker/service_worker_job_unittest.cc
@@ -7,9 +7,9 @@
#include "base/files/scoped_temp_dir.h"
#include "base/logging.h"
-#include "base/macros.h"
#include "base/optional.h"
#include "base/run_loop.h"
+#include "base/stl_util.h"
#include "base/test/test_simple_task_runner.h"
#include "base/time/time.h"
#include "content/browser/service_worker/embedded_worker_registry.h"
@@ -944,7 +944,7 @@
scoped_refptr<IOBuffer> body_buffer =
base::MakeRefCounted<WrappedIOBuffer>(body.data());
const char kHttpHeaders[] = "HTTP/1.0 200 HONKYDORY\0\0";
- std::string headers(kHttpHeaders, arraysize(kHttpHeaders));
+ std::string headers(kHttpHeaders, base::size(kHttpHeaders));
WriteResponse(storage, id, headers, body_buffer.get(), body.length());
}
diff --git a/content/browser/service_worker/service_worker_read_from_cache_job_unittest.cc b/content/browser/service_worker/service_worker_read_from_cache_job_unittest.cc
index aef2b350..468ff72 100644
--- a/content/browser/service_worker/service_worker_read_from_cache_job_unittest.cc
+++ b/content/browser/service_worker/service_worker_read_from_cache_job_unittest.cc
@@ -11,6 +11,7 @@
#include "base/macros.h"
#include "base/memory/ptr_util.h"
#include "base/run_loop.h"
+#include "base/stl_util.h"
#include "content/browser/service_worker/embedded_worker_test_helper.h"
#include "content/browser/service_worker/service_worker_context_core.h"
#include "content/browser/service_worker/service_worker_registration.h"
@@ -112,8 +113,8 @@
bool WriteResource(int64_t resource_id) {
const char kHttpHeaders[] = "HTTP/1.0 200 OK\0Content-Length: 5\0\0";
const char kHttpBody[] = "Hello";
- const int length = arraysize(kHttpBody);
- std::string headers(kHttpHeaders, arraysize(kHttpHeaders));
+ const int length = base::size(kHttpBody);
+ std::string headers(kHttpHeaders, base::size(kHttpHeaders));
scoped_refptr<net::IOBuffer> body =
base::MakeRefCounted<net::WrappedIOBuffer>(kHttpBody);
diff --git a/content/browser/service_worker/service_worker_storage_unittest.cc b/content/browser/service_worker/service_worker_storage_unittest.cc
index 6f03308c..08bf400 100644
--- a/content/browser/service_worker/service_worker_storage_unittest.cc
+++ b/content/browser/service_worker/service_worker_storage_unittest.cc
@@ -12,8 +12,8 @@
#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
#include "base/logging.h"
-#include "base/macros.h"
#include "base/run_loop.h"
+#include "base/stl_util.h"
#include "base/test/metrics/histogram_tester.h"
#include "base/threading/thread_task_runner_handle.h"
#include "build/build_config.h"
@@ -208,7 +208,7 @@
int WriteBasicResponse(ServiceWorkerStorage* storage, int64_t id) {
const char kHttpHeaders[] = "HTTP/1.0 200 HONKYDORY\0Content-Length: 5\0\0";
const char kHttpBody[] = "Hello";
- std::string headers(kHttpHeaders, arraysize(kHttpHeaders));
+ std::string headers(kHttpHeaders, base::size(kHttpHeaders));
return WriteStringResponse(storage, id, headers, std::string(kHttpBody));
}
@@ -1844,7 +1844,7 @@
bool IsOriginTrialsSupported() const override { return true; }
base::StringPiece GetPublicKey() const override {
return base::StringPiece(reinterpret_cast<const char*>(kTestPublicKey),
- arraysize(kTestPublicKey));
+ base::size(kTestPublicKey));
}
bool IsOriginSecure(const GURL& url) const override {
return content::IsOriginSecure(url);
diff --git a/content/browser/service_worker/service_worker_write_to_cache_job_unittest.cc b/content/browser/service_worker/service_worker_write_to_cache_job_unittest.cc
index 4730ec0..b4b0ec0 100644
--- a/content/browser/service_worker/service_worker_write_to_cache_job_unittest.cc
+++ b/content/browser/service_worker/service_worker_write_to_cache_job_unittest.cc
@@ -9,10 +9,10 @@
#include "base/bind_helpers.h"
#include "base/location.h"
-#include "base/macros.h"
#include "base/memory/ptr_util.h"
#include "base/run_loop.h"
#include "base/single_thread_task_runner.h"
+#include "base/stl_util.h"
#include "base/threading/thread_task_runner_handle.h"
#include "content/browser/service_worker/embedded_worker_test_helper.h"
#include "content/browser/service_worker/service_worker_context_core.h"
@@ -65,18 +65,16 @@
net::URLRequestJob* CreateNormalURLRequestJob(
net::URLRequest* request,
net::NetworkDelegate* network_delegate) {
- return new net::URLRequestTestJob(request,
- network_delegate,
- std::string(kHeaders, arraysize(kHeaders)),
- kScriptCode,
- true);
+ return new net::URLRequestTestJob(request, network_delegate,
+ std::string(kHeaders, base::size(kHeaders)),
+ kScriptCode, true);
}
net::URLRequestJob* CreateResponseJob(const std::string& response_data,
net::URLRequest* request,
net::NetworkDelegate* network_delegate) {
return new net::URLRequestTestJob(request, network_delegate,
- std::string(kHeaders, arraysize(kHeaders)),
+ std::string(kHeaders, base::size(kHeaders)),
response_data, true);
}
@@ -97,11 +95,9 @@
"Expires: Thu, 1 Jan 2100 20:00:00 GMT\n"
"\n";
return new net::URLRequestTestJob(
- request,
- network_delegate,
- std::string(kPlainTextHeaders, arraysize(kPlainTextHeaders)),
- kScriptCode,
- true);
+ request, network_delegate,
+ std::string(kPlainTextHeaders, base::size(kPlainTextHeaders)),
+ kScriptCode, true);
}
class SSLCertificateErrorJob : public net::URLRequestTestJob {
@@ -141,11 +137,9 @@
net::URLRequestJob* CreateSSLCertificateErrorJob(
net::URLRequest* request,
net::NetworkDelegate* network_delegate) {
- return new SSLCertificateErrorJob(request,
- network_delegate,
- std::string(kHeaders, arraysize(kHeaders)),
- kScriptCode,
- true);
+ return new SSLCertificateErrorJob(request, network_delegate,
+ std::string(kHeaders, base::size(kHeaders)),
+ kScriptCode, true);
}
class CertStatusErrorJob : public net::URLRequestTestJob {
@@ -172,11 +166,9 @@
net::URLRequestJob* CreateCertStatusErrorJob(
net::URLRequest* request,
net::NetworkDelegate* network_delegate) {
- return new CertStatusErrorJob(request,
- network_delegate,
- std::string(kHeaders, arraysize(kHeaders)),
- kScriptCode,
- true);
+ return new CertStatusErrorJob(request, network_delegate,
+ std::string(kHeaders, base::size(kHeaders)),
+ kScriptCode, true);
}
class MockHttpProtocolHandler
diff --git a/content/browser/site_per_process_browsertest.cc b/content/browser/site_per_process_browsertest.cc
index 166635d8..02c5cd1 100644
--- a/content/browser/site_per_process_browsertest.cc
+++ b/content/browser/site_per_process_browsertest.cc
@@ -29,6 +29,7 @@
#include "base/scoped_observer.h"
#include "base/sequenced_task_runner.h"
#include "base/single_thread_task_runner.h"
+#include "base/stl_util.h"
#include "base/strings/pattern.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
@@ -3791,10 +3792,10 @@
embedded_test_server()->GetURL("b.com", "/tall_page.html")};
const std::string scrolling_values[] = {"yes", "auto", "no"};
- for (size_t i = 0; i < arraysize(scrolling_values); ++i) {
+ for (size_t i = 0; i < base::size(scrolling_values); ++i) {
bool expect_scrollbar = scrolling_values[i] != "no";
set_scrolling_property(root->current_frame_host(), scrolling_values[i]);
- for (size_t j = 0; j < arraysize(urls); ++j) {
+ for (size_t j = 0; j < base::size(urls); ++j) {
NavigateFrameToURL(child, urls[j]);
EXPECT_EQ(expect_scrollbar, has_scrollbar(child->current_frame_host()));
}
@@ -3839,7 +3840,7 @@
// Before each navigation, we change the marginwidth and marginheight
// properties of the frame. We then check whether those properties are applied
// correctly after the navigation has completed.
- for (size_t i = 0; i < arraysize(urls); ++i) {
+ for (size_t i = 0; i < base::size(urls); ++i) {
// Change marginwidth and marginheight before navigating.
EXPECT_TRUE(ExecJs(
root,
@@ -3899,7 +3900,7 @@
// Before each navigation, we change the csp property of the frame.
// We then check whether that property is applied
// correctly after the navigation has completed.
- for (size_t i = 0; i < arraysize(urls); ++i) {
+ for (size_t i = 0; i < base::size(urls); ++i) {
// Change csp before navigating.
EXPECT_TRUE(ExecuteScript(
root,
@@ -7733,7 +7734,7 @@
class PendingWidgetMessageFilter : public BrowserMessageFilter {
public:
PendingWidgetMessageFilter()
- : BrowserMessageFilter(kMessageClasses, arraysize(kMessageClasses)),
+ : BrowserMessageFilter(kMessageClasses, base::size(kMessageClasses)),
routing_id_(MSG_ROUTING_NONE) {}
bool OnMessageReceived(const IPC::Message& message) override {
diff --git a/content/browser/storage_partition_impl_unittest.cc b/content/browser/storage_partition_impl_unittest.cc
index 2517a1f0..fb27505 100644
--- a/content/browser/storage_partition_impl_unittest.cc
+++ b/content/browser/storage_partition_impl_unittest.cc
@@ -7,9 +7,9 @@
#include "base/files/file_util.h"
#include "base/location.h"
-#include "base/macros.h"
#include "base/run_loop.h"
#include "base/single_thread_task_runner.h"
+#include "base/stl_util.h"
#include "base/task/post_task.h"
#include "base/test/scoped_feature_list.h"
#include "base/threading/thread.h"
@@ -254,8 +254,8 @@
auto serialized_origin =
leveldb::StdStringToUint8Vector(origin.Serialize());
std::vector<uint8_t> key;
- key.reserve(arraysize(kMetaPrefix) + serialized_origin.size());
- key.insert(key.end(), kMetaPrefix, kMetaPrefix + arraysize(kMetaPrefix));
+ key.reserve(base::size(kMetaPrefix) + serialized_origin.size());
+ key.insert(key.end(), kMetaPrefix, kMetaPrefix + base::size(kMetaPrefix));
key.insert(key.end(), serialized_origin.begin(), serialized_origin.end());
return key;
}
@@ -1477,8 +1477,8 @@
const char test_data[] = {0, 1, 2, 3, 4, 5};
base::File file = tester.OpenClearKeyFileForWrite();
EXPECT_TRUE(file.IsValid());
- EXPECT_EQ(static_cast<int>(arraysize(test_data)),
- file.Write(0, test_data, arraysize(test_data)));
+ EXPECT_EQ(static_cast<int>(base::size(test_data)),
+ file.Write(0, test_data, base::size(test_data)));
base::RunLoop run_loop;
base::ThreadTaskRunnerHandle::Get()->PostTask(
@@ -1490,8 +1490,8 @@
EXPECT_FALSE(tester.DataExistsForOrigin(kOrigin2));
const char more_data[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
- EXPECT_EQ(static_cast<int>(arraysize(more_data)),
- file.WriteAtCurrentPos(more_data, arraysize(more_data)));
+ EXPECT_EQ(static_cast<int>(base::size(more_data)),
+ file.WriteAtCurrentPos(more_data, base::size(more_data)));
base::File file2 = tester.OpenClearKeyFileForWrite();
EXPECT_FALSE(file2.IsValid());
diff --git a/content/browser/utility_process_host.cc b/content/browser/utility_process_host.cc
index 233ce5d..074f2906 100644
--- a/content/browser/utility_process_host.cc
+++ b/content/browser/utility_process_host.cc
@@ -13,6 +13,7 @@
#include "base/files/file_path.h"
#include "base/i18n/base_i18n_switches.h"
#include "base/sequenced_task_runner.h"
+#include "base/stl_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/task/post_task.h"
#include "components/network_session_configurator/common/network_switches.h"
@@ -398,7 +399,7 @@
#endif
};
cmd_line->CopySwitchesFrom(browser_command_line, kSwitchNames,
- arraysize(kSwitchNames));
+ base::size(kSwitchNames));
network_session_configurator::CopyNetworkSwitches(browser_command_line,
cmd_line.get());
diff --git a/content/browser/webui/web_ui_data_source_unittest.cc b/content/browser/webui/web_ui_data_source_unittest.cc
index 6125eb9..a9d1f501 100644
--- a/content/browser/webui/web_ui_data_source_unittest.cc
+++ b/content/browser/webui/web_ui_data_source_unittest.cc
@@ -3,8 +3,8 @@
// found in the LICENSE file.
#include "base/bind.h"
-#include "base/macros.h"
#include "base/memory/ref_counted_memory.h"
+#include "base/stl_util.h"
#include "base/strings/utf_string_conversions.h"
#include "content/browser/webui/web_ui_data_source_impl.h"
#include "content/public/test/test_browser_thread_bundle.h"
@@ -38,10 +38,10 @@
base::RefCountedStaticMemory* bytes = nullptr;
if (resource_id == kDummyDefaultResourceId) {
bytes = new base::RefCountedStaticMemory(
- kDummyDefaultResource, arraysize(kDummyDefaultResource));
+ kDummyDefaultResource, base::size(kDummyDefaultResource));
} else if (resource_id == kDummyResourceId) {
bytes = new base::RefCountedStaticMemory(kDummyResource,
- arraysize(kDummyResource));
+ base::size(kDummyResource));
}
return bytes;
}
diff --git a/content/child/blink_platform_impl.cc b/content/child/blink_platform_impl.cc
index 7b3fab6f..ee19409 100644
--- a/content/child/blink_platform_impl.cc
+++ b/content/child/blink_platform_impl.cc
@@ -12,13 +12,13 @@
#include "base/bind.h"
#include "base/files/file_path.h"
#include "base/location.h"
-#include "base/macros.h"
#include "base/memory/singleton.h"
#include "base/metrics/user_metrics_action.h"
#include "base/rand_util.h"
#include "base/run_loop.h"
#include "base/sequence_checker.h"
#include "base/single_thread_task_runner.h"
+#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
@@ -524,7 +524,7 @@
// TODO(flackr): We should use a better than linear search here, a trie would
// be ideal.
- for (size_t i = 0; i < arraysize(kDataResources); ++i) {
+ for (size_t i = 0; i < base::size(kDataResources); ++i) {
if (!strcmp(name, kDataResources[i].name)) {
base::StringPiece resource = GetContentClient()->GetDataResource(
kDataResources[i].id, kDataResources[i].scale_factor);
diff --git a/content/common/font_list_fontconfig.cc b/content/common/font_list_fontconfig.cc
index a14eae7..ed8d8584 100644
--- a/content/common/font_list_fontconfig.cc
+++ b/content/common/font_list_fontconfig.cc
@@ -11,6 +11,7 @@
#include <fontconfig/fontconfig.h>
+#include "base/stl_util.h"
#include "base/values.h"
namespace content {
@@ -38,7 +39,7 @@
// See https://www.freetype.org/freetype2/docs/reference/ft2-font_formats.html
// for the list of possible formats.
const char* allowed_formats[] = { "TrueType", "CFF" };
- for (size_t i = 0; i < arraysize(allowed_formats); ++i) {
+ for (size_t i = 0; i < base::size(allowed_formats); ++i) {
auto format_pattern = CreateFormatPattern(allowed_formats[i]);
std::unique_ptr<FcFontSet, decltype(&FcFontSetDestroy)> fontset(
FcFontList(nullptr, format_pattern.get(), object_set.get()),
diff --git a/content/common/unique_name_helper.cc b/content/common/unique_name_helper.cc
index 28b28172..26d8a5e2 100644
--- a/content/common/unique_name_helper.cc
+++ b/content/common/unique_name_helper.cc
@@ -8,6 +8,7 @@
#include <utility>
#include "base/logging.h"
+#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_piece.h"
#include "base/strings/string_util.h"
@@ -160,9 +161,9 @@
std::string hashed_name;
uint8_t result[crypto::kSHA256Length];
- crypto::SHA256HashString(name, result, arraysize(result));
+ crypto::SHA256HashString(name, result, base::size(result));
hashed_name += "<!--frameHash";
- hashed_name += base::HexEncode(result, arraysize(result));
+ hashed_name += base::HexEncode(result, base::size(result));
hashed_name += "-->";
return hashed_name;
}
diff --git a/content/common/webplugininfo_unittest.cc b/content/common/webplugininfo_unittest.cc
index a0b1b63..05ce782 100644
--- a/content/common/webplugininfo_unittest.cc
+++ b/content/common/webplugininfo_unittest.cc
@@ -10,7 +10,7 @@
#include <string>
#include <vector>
-#include "base/macros.h"
+#include "base/stl_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/version.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -33,7 +33,7 @@
{ "1..0", "1.0.0" } // Empty version component
};
- for (size_t i = 0; i < arraysize(versions); i++) {
+ for (size_t i = 0; i < base::size(versions); i++) {
base::Version version;
WebPluginInfo::CreateVersionFromString(
base::ASCIIToUTF16(versions[i][0]), &version);
diff --git a/content/public/test/browser_test_utils.cc b/content/public/test/browser_test_utils.cc
index e8f77a30..6f604ca7 100644
--- a/content/public/test/browser_test_utils.cc
+++ b/content/public/test/browser_test_utils.cc
@@ -15,7 +15,6 @@
#include "base/command_line.h"
#include "base/guid.h"
#include "base/json/json_reader.h"
-#include "base/macros.h"
#include "base/process/kill.h"
#include "base/run_loop.h"
#include "base/stl_util.h"
@@ -3087,7 +3086,7 @@
SynchronizeVisualPropertiesMessageFilter::
SynchronizeVisualPropertiesMessageFilter()
: content::BrowserMessageFilter(kMessageClassesToFilter,
- arraysize(kMessageClassesToFilter)),
+ base::size(kMessageClassesToFilter)),
screen_space_rect_run_loop_(std::make_unique<base::RunLoop>()),
screen_space_rect_received_(false) {}
diff --git a/content/public/test/test_host_resolver.cc b/content/public/test/test_host_resolver.cc
index e8e02a4..4c040d2 100644
--- a/content/public/test/test_host_resolver.cc
+++ b/content/public/test/test_host_resolver.cc
@@ -4,7 +4,7 @@
#include "content/public/test/test_host_resolver.h"
-#include "base/macros.h"
+#include "base/stl_util.h"
#include "base/threading/thread.h"
#include "content/browser/notification_service_impl.h"
#include "net/base/net_errors.h"
@@ -33,7 +33,7 @@
if (host == net::GetHostName()) {
local = true;
} else {
- for (size_t i = 0; i < arraysize(kLocalHostNames); i++)
+ for (size_t i = 0; i < base::size(kLocalHostNames); i++)
if (host == kLocalHostNames[i]) {
local = true;
break;
diff --git a/content/renderer/java/gin_java_bridge_value_converter_unittest.cc b/content/renderer/java/gin_java_bridge_value_converter_unittest.cc
index 9e637b1..ef8e48d 100644
--- a/content/renderer/java/gin_java_bridge_value_converter_unittest.cc
+++ b/content/renderer/java/gin_java_bridge_value_converter_unittest.cc
@@ -9,7 +9,7 @@
#include <cmath>
#include <memory>
-#include "base/macros.h"
+#include "base/stl_util.h"
#include "base/strings/stringprintf.h"
#include "content/common/android/gin_java_bridge_value.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -118,7 +118,7 @@
"4", "Int32Array", "4", "Uint32Array",
"4", "Float32Array", "8", "Float64Array"
};
- for (size_t i = 0; i < arraysize(array_types); i += 2) {
+ for (size_t i = 0; i < base::size(array_types); i += 2) {
const char* typed_array_type = array_types[i + 1];
v8::Local<v8::Script> script(
v8::Script::Compile(
diff --git a/content/renderer/loader/shared_memory_data_consumer_handle_unittest.cc b/content/renderer/loader/shared_memory_data_consumer_handle_unittest.cc
index bca355a..0a99ca6a 100644
--- a/content/renderer/loader/shared_memory_data_consumer_handle_unittest.cc
+++ b/content/renderer/loader/shared_memory_data_consumer_handle_unittest.cc
@@ -14,9 +14,9 @@
#include "base/bind.h"
#include "base/callback.h"
#include "base/location.h"
-#include "base/macros.h"
#include "base/run_loop.h"
#include "base/single_thread_task_runner.h"
+#include "base/stl_util.h"
#include "base/strings/string_split.h"
#include "base/task_runner.h"
#include "base/test/scoped_task_environment.h"
@@ -379,31 +379,31 @@
auto reader = handle_->ObtainReader(
nullptr, blink::scheduler::GetSingleThreadTaskRunnerForTesting());
- std::fill(&buffer[0], &buffer[arraysize(buffer)], 0);
+ std::fill(&buffer[0], &buffer[base::size(buffer)], 0);
result = reader->Read(buffer, 6, kNone, &read);
EXPECT_EQ(kOk, result);
EXPECT_EQ(6u, read);
EXPECT_STREQ("Once u", buffer);
- std::fill(&buffer[0], &buffer[arraysize(buffer)], 0);
+ std::fill(&buffer[0], &buffer[base::size(buffer)], 0);
result = reader->Read(buffer, 2, kNone, &read);
EXPECT_EQ(kOk, result);
EXPECT_EQ(2u, read);
EXPECT_STREQ("po", buffer);
- std::fill(&buffer[0], &buffer[arraysize(buffer)], 0);
+ std::fill(&buffer[0], &buffer[base::size(buffer)], 0);
result = reader->Read(buffer, 9, kNone, &read);
EXPECT_EQ(kOk, result);
EXPECT_EQ(9u, read);
EXPECT_STREQ("n a time ", buffer);
- std::fill(&buffer[0], &buffer[arraysize(buffer)], 0);
+ std::fill(&buffer[0], &buffer[base::size(buffer)], 0);
result = reader->Read(buffer, 3, kNone, &read);
EXPECT_EQ(kOk, result);
EXPECT_EQ(3u, read);
EXPECT_STREQ("the", buffer);
- std::fill(&buffer[0], &buffer[arraysize(buffer)], 0);
+ std::fill(&buffer[0], &buffer[base::size(buffer)], 0);
result = reader->Read(buffer, 20, kNone, &read);
EXPECT_EQ(kOk, result);
EXPECT_EQ(9u, read);
@@ -424,19 +424,19 @@
auto reader = handle_->ObtainReader(
nullptr, blink::scheduler::GetSingleThreadTaskRunnerForTesting());
- std::fill(&buffer[0], &buffer[arraysize(buffer)], 0);
+ std::fill(&buffer[0], &buffer[base::size(buffer)], 0);
result = reader->Read(buffer, 6, kNone, &read);
EXPECT_EQ(kOk, result);
EXPECT_EQ(6u, read);
EXPECT_STREQ("Once u", buffer);
- std::fill(&buffer[0], &buffer[arraysize(buffer)], 0);
+ std::fill(&buffer[0], &buffer[base::size(buffer)], 0);
result = reader->Read(buffer, 2, kNone, &read);
EXPECT_EQ(kOk, result);
EXPECT_EQ(2u, read);
EXPECT_STREQ("po", buffer);
- std::fill(&buffer[0], &buffer[arraysize(buffer)], 0);
+ std::fill(&buffer[0], &buffer[base::size(buffer)], 0);
result = reader->Read(buffer, 9, kNone, &read);
EXPECT_EQ(kOk, result);
EXPECT_EQ(2u, read);
@@ -444,7 +444,7 @@
writer_->AddData(NewFixedData("a "));
- std::fill(&buffer[0], &buffer[arraysize(buffer)], 0);
+ std::fill(&buffer[0], &buffer[base::size(buffer)], 0);
result = reader->Read(buffer, 1, kNone, &read);
EXPECT_EQ(kOk, result);
EXPECT_EQ(1u, read);
@@ -456,13 +456,13 @@
writer_->AddData(NewFixedData("a "));
writer_->Close();
- std::fill(&buffer[0], &buffer[arraysize(buffer)], 0);
+ std::fill(&buffer[0], &buffer[base::size(buffer)], 0);
result = reader->Read(buffer, 9, kNone, &read);
EXPECT_EQ(kOk, result);
EXPECT_EQ(9u, read);
EXPECT_STREQ(" time the", buffer);
- std::fill(&buffer[0], &buffer[arraysize(buffer)], 0);
+ std::fill(&buffer[0], &buffer[base::size(buffer)], 0);
result = reader->Read(buffer, 20, kNone, &read);
EXPECT_EQ(kOk, result);
EXPECT_EQ(9u, read);
diff --git a/content/renderer/loader/web_url_loader_impl_unittest.cc b/content/renderer/loader/web_url_loader_impl_unittest.cc
index 0af9e414..56184d4 100644
--- a/content/renderer/loader/web_url_loader_impl_unittest.cc
+++ b/content/renderer/loader/web_url_loader_impl_unittest.cc
@@ -11,10 +11,10 @@
#include <vector>
#include "base/command_line.h"
-#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "base/run_loop.h"
#include "base/single_thread_task_runner.h"
+#include "base/stl_util.h"
#include "base/test/scoped_task_environment.h"
#include "base/time/default_tick_clock.h"
#include "base/time/time.h"
@@ -364,9 +364,9 @@
void DoCompleteRequest() {
EXPECT_FALSE(client()->did_finish());
network::URLLoaderCompletionStatus status(net::OK);
- status.encoded_data_length = arraysize(kTestData);
- status.encoded_body_length = arraysize(kTestData);
- status.decoded_body_length = arraysize(kTestData);
+ status.encoded_data_length = base::size(kTestData);
+ status.encoded_body_length = base::size(kTestData);
+ status.decoded_body_length = base::size(kTestData);
peer()->OnCompletedRequest(status);
EXPECT_TRUE(client()->did_finish());
// There should be no error.
@@ -376,9 +376,9 @@
void DoFailRequest() {
EXPECT_FALSE(client()->did_finish());
network::URLLoaderCompletionStatus status(net::ERR_FAILED);
- status.encoded_data_length = arraysize(kTestData);
- status.encoded_body_length = arraysize(kTestData);
- status.decoded_body_length = arraysize(kTestData);
+ status.encoded_data_length = base::size(kTestData);
+ status.encoded_body_length = base::size(kTestData);
+ status.decoded_body_length = base::size(kTestData);
peer()->OnCompletedRequest(status);
EXPECT_FALSE(client()->did_finish());
ASSERT_TRUE(client()->error());
diff --git a/content/renderer/media/stream/media_stream_audio_processor_unittest.cc b/content/renderer/media/stream/media_stream_audio_processor_unittest.cc
index 7260cac..ea10f58 100644
--- a/content/renderer/media/stream/media_stream_audio_processor_unittest.cc
+++ b/content/renderer/media/stream/media_stream_audio_processor_unittest.cc
@@ -12,10 +12,10 @@
#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
#include "base/logging.h"
-#include "base/macros.h"
#include "base/memory/aligned_memory.h"
#include "base/message_loop/message_loop_current.h"
#include "base/path_service.h"
+#include "base/stl_util.h"
#include "base/test/scoped_task_environment.h"
#include "base/threading/thread_task_runner_handle.h"
#include "base/time/time.h"
@@ -250,7 +250,7 @@
static const int kSupportedSampleRates[] =
{ 8000, 16000, 22050, 32000, 44100, 48000 };
- for (size_t i = 0; i < arraysize(kSupportedSampleRates); ++i) {
+ for (size_t i = 0; i < base::size(kSupportedSampleRates); ++i) {
int buffer_size = kSupportedSampleRates[i] / 100;
media::AudioParameters params(media::AudioParameters::AUDIO_PCM_LOW_LATENCY,
media::CHANNEL_LAYOUT_STEREO,
diff --git a/content/renderer/media/stream/media_stream_constraints_util_video_content_unittest.cc b/content/renderer/media/stream/media_stream_constraints_util_video_content_unittest.cc
index 32b5f5d..a4ad815 100644
--- a/content/renderer/media/stream/media_stream_constraints_util_video_content_unittest.cc
+++ b/content/renderer/media/stream/media_stream_constraints_util_video_content_unittest.cc
@@ -7,6 +7,7 @@
#include <cmath>
#include <string>
+#include "base/stl_util.h"
#include "content/renderer/media/stream/media_stream_source.h"
#include "content/renderer/media/stream/mock_constraint_factory.h"
#include "media/base/limits.h"
@@ -2020,13 +2021,13 @@
blink::WebString id_vector1[] = {blink::WebString::FromASCII(kDeviceID1),
blink::WebString::FromASCII(kDeviceID2)};
advanced1.device_id.SetExact(
- blink::WebVector<blink::WebString>(id_vector1, arraysize(id_vector1)));
+ blink::WebVector<blink::WebString>(id_vector1, base::size(id_vector1)));
blink::WebString id_vector2[] = {blink::WebString::FromASCII(kDeviceID2),
blink::WebString::FromASCII(kDeviceID3)};
blink::WebMediaTrackConstraintSet& advanced2 =
constraint_factory_.AddAdvanced();
advanced2.device_id.SetExact(
- blink::WebVector<blink::WebString>(id_vector2, arraysize(id_vector2)));
+ blink::WebVector<blink::WebString>(id_vector2, base::size(id_vector2)));
auto result = SelectSettings();
EXPECT_TRUE(result.HasValue());
// kDeviceID2 must be selected because it is the only one that satisfies both
@@ -2047,13 +2048,13 @@
blink::WebString id_vector1[] = {blink::WebString::FromASCII(kDeviceID1),
blink::WebString::FromASCII(kDeviceID2)};
advanced1.device_id.SetExact(
- blink::WebVector<blink::WebString>(id_vector1, arraysize(id_vector1)));
+ blink::WebVector<blink::WebString>(id_vector1, base::size(id_vector1)));
blink::WebString id_vector2[] = {blink::WebString::FromASCII(kDeviceID3),
blink::WebString::FromASCII(kDeviceID4)};
blink::WebMediaTrackConstraintSet& advanced2 =
constraint_factory_.AddAdvanced();
advanced2.device_id.SetExact(
- blink::WebVector<blink::WebString>(id_vector2, arraysize(id_vector2)));
+ blink::WebVector<blink::WebString>(id_vector2, base::size(id_vector2)));
auto result = SelectSettings();
EXPECT_TRUE(result.HasValue());
// The second advanced set must be ignored because it contradicts the first
@@ -2072,12 +2073,12 @@
blink::WebString id_vector1[] = {blink::WebString::FromASCII(kDeviceID1),
blink::WebString::FromASCII(kDeviceID2)};
advanced.device_id.SetExact(
- blink::WebVector<blink::WebString>(id_vector1, arraysize(id_vector1)));
+ blink::WebVector<blink::WebString>(id_vector1, base::size(id_vector1)));
blink::WebString id_vector2[] = {blink::WebString::FromASCII(kDeviceID2),
blink::WebString::FromASCII(kDeviceID3)};
constraint_factory_.basic().device_id.SetIdeal(
- blink::WebVector<blink::WebString>(id_vector2, arraysize(id_vector2)));
+ blink::WebVector<blink::WebString>(id_vector2, base::size(id_vector2)));
auto result = SelectSettings();
EXPECT_TRUE(result.HasValue());
// Should select kDeviceID2, which appears in ideal and satisfies the advanced
diff --git a/content/renderer/media/stream/webmediaplayer_ms_unittest.cc b/content/renderer/media/stream/webmediaplayer_ms_unittest.cc
index 75c5d37..89d89ec 100644
--- a/content/renderer/media/stream/webmediaplayer_ms_unittest.cc
+++ b/content/renderer/media/stream/webmediaplayer_ms_unittest.cc
@@ -10,6 +10,7 @@
#include "base/containers/circular_deque.h"
#include "base/run_loop.h"
#include "base/single_thread_task_runner.h"
+#include "base/stl_util.h"
#include "base/test/scoped_task_environment.h"
#include "base/time/time.h"
#include "build/build_config.h"
@@ -1119,7 +1120,7 @@
// Change rotation.
tokens[0] = 33;
- timestamps = std::vector<int>(tokens, tokens + arraysize(tokens));
+ timestamps = std::vector<int>(tokens, tokens + base::size(tokens));
provider->QueueFrames(timestamps, false, false, 17, media::VIDEO_ROTATION_0);
if (enable_surface_layer_for_video_) {
EXPECT_CALL(*submitter_ptr_, SetRotation(media::VIDEO_ROTATION_0));
@@ -1153,7 +1154,7 @@
// Push one opaque frame.
const int kTestBrake = static_cast<int>(FrameType::TEST_BRAKE);
int tokens[] = {0, kTestBrake};
- std::vector<int> timestamps(tokens, tokens + arraysize(tokens));
+ std::vector<int> timestamps(tokens, tokens + base::size(tokens));
provider->QueueFrames(timestamps, true);
if (enable_surface_layer_for_video_) {
@@ -1181,7 +1182,7 @@
// Push one transparent frame.
tokens[0] = 33;
- timestamps = std::vector<int>(tokens, tokens + arraysize(tokens));
+ timestamps = std::vector<int>(tokens, tokens + base::size(tokens));
provider->QueueFrames(timestamps, false);
if (enable_surface_layer_for_video_) {
EXPECT_CALL(*surface_layer_bridge_ptr_, SetContentsOpaque(false));
@@ -1196,7 +1197,7 @@
// Push another transparent frame.
tokens[0] = 66;
- timestamps = std::vector<int>(tokens, tokens + arraysize(tokens));
+ timestamps = std::vector<int>(tokens, tokens + base::size(tokens));
provider->QueueFrames(timestamps, true);
if (enable_surface_layer_for_video_) {
EXPECT_CALL(*surface_layer_bridge_ptr_, SetContentsOpaque(true));
diff --git a/content/renderer/media/webrtc/rtc_video_encoder.cc b/content/renderer/media/webrtc/rtc_video_encoder.cc
index c127936..f3e50c9 100644
--- a/content/renderer/media/webrtc/rtc_video_encoder.cc
+++ b/content/renderer/media/webrtc/rtc_video_encoder.cc
@@ -14,10 +14,10 @@
#include "base/containers/circular_deque.h"
#include "base/location.h"
#include "base/logging.h"
-#include "base/macros.h"
#include "base/metrics/histogram_macros.h"
#include "base/numerics/safe_conversions.h"
#include "base/single_thread_task_runner.h"
+#include "base/stl_util.h"
#include "base/synchronization/lock.h"
#include "base/synchronization/waitable_event.h"
#include "base/threading/thread_checker.h"
@@ -611,7 +611,7 @@
static const char* const kErrorNames[] = {
"kIllegalStateError", "kInvalidArgumentError", "kPlatformFailureError"};
static_assert(
- arraysize(kErrorNames) == media::VideoEncodeAccelerator::kErrorMax + 1,
+ base::size(kErrorNames) == media::VideoEncodeAccelerator::kErrorMax + 1,
"Different number of errors and textual descriptions");
DLOG(ERROR) << location.ToString() << kErrorNames[error] << " - " << str;
NotifyError(error);
diff --git a/content/renderer/media/webrtc/stun_field_trial.cc b/content/renderer/media/webrtc/stun_field_trial.cc
index b7d064c..4f810949 100644
--- a/content/renderer/media/webrtc/stun_field_trial.cc
+++ b/content/renderer/media/webrtc/stun_field_trial.cc
@@ -9,9 +9,9 @@
#include "base/bind.h"
#include "base/location.h"
#include "base/logging.h"
-#include "base/macros.h"
#include "base/metrics/histogram_macros.h"
#include "base/rand_util.h"
+#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
#include "base/strings/stringprintf.h"
@@ -42,7 +42,7 @@
// This needs to match "NatType" in histograms.xml.
const char* const NatTypeNames[] =
{"NoNAT", "UnknownNAT", "SymNAT", "NonSymNAT"};
-static_assert(arraysize(NatTypeNames) == NAT_TYPE_MAX,
+static_assert(base::size(NatTypeNames) == NAT_TYPE_MAX,
"NatType enums must match names");
NatType GetNatType(stunprober::NatType nat_type) {
diff --git a/content/renderer/media_recorder/media_recorder_handler.cc b/content/renderer/media_recorder/media_recorder_handler.cc
index b6b1fb0..391d638 100644
--- a/content/renderer/media_recorder/media_recorder_handler.cc
+++ b/content/renderer/media_recorder/media_recorder_handler.cc
@@ -9,7 +9,7 @@
#include "base/bind.h"
#include "base/location.h"
#include "base/logging.h"
-#include "base/macros.h"
+#include "base/stl_util.h"
#include "base/strings/string_tokenizer.h"
#include "base/strings/string_util.h"
#include "base/system/sys_info.h"
@@ -166,7 +166,7 @@
static const char* const kAudioCodecs[] = {"opus", "pcm"};
const char* const* codecs = video ? &kVideoCodecs[0] : &kAudioCodecs[0];
const int codecs_count =
- video ? arraysize(kVideoCodecs) : arraysize(kAudioCodecs);
+ video ? base::size(kVideoCodecs) : base::size(kAudioCodecs);
std::vector<std::string> codecs_list;
media::SplitCodecs(web_codecs.Utf8(), &codecs_list);
diff --git a/content/renderer/media_recorder/video_track_recorder.cc b/content/renderer/media_recorder/video_track_recorder.cc
index ef28d3170..bb709679 100644
--- a/content/renderer/media_recorder/video_track_recorder.cc
+++ b/content/renderer/media_recorder/video_track_recorder.cc
@@ -8,8 +8,8 @@
#include "base/bind.h"
#include "base/logging.h"
-#include "base/macros.h"
#include "base/metrics/histogram_macros.h"
+#include "base/stl_util.h"
#include "base/task_runner_util.h"
#include "base/threading/thread.h"
#include "base/threading/thread_task_runner_handle.h"
@@ -71,7 +71,7 @@
#endif
};
-static_assert(arraysize(kPreferredCodecIdAndVEAProfiles) ==
+static_assert(base::size(kPreferredCodecIdAndVEAProfiles) ==
static_cast<int>(CodecId::LAST),
"|kPreferredCodecIdAndVEAProfiles| should consider all CodecIds");
diff --git a/content/renderer/notifications/notification_data_conversions_unittest.cc b/content/renderer/notifications/notification_data_conversions_unittest.cc
index 33636ba..d1e90ce 100644
--- a/content/renderer/notifications/notification_data_conversions_unittest.cc
+++ b/content/renderer/notifications/notification_data_conversions_unittest.cc
@@ -7,7 +7,7 @@
#include <stddef.h>
#include <stdint.h>
-#include "base/macros.h"
+#include "base/stl_util.h"
#include "base/strings/utf_string_conversions.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -39,10 +39,11 @@
TEST(NotificationDataConversionsTest, ToWebNotificationData) {
std::vector<int> vibration_pattern(
kNotificationVibrationPattern,
- kNotificationVibrationPattern + arraysize(kNotificationVibrationPattern));
+ kNotificationVibrationPattern +
+ base::size(kNotificationVibrationPattern));
std::vector<char> developer_data(
- kNotificationData, kNotificationData + arraysize(kNotificationData));
+ kNotificationData, kNotificationData + base::size(kNotificationData));
blink::PlatformNotificationData platform_data;
platform_data.title = base::ASCIIToUTF16(kNotificationTitle);
diff --git a/content/renderer/p2p/filtering_network_manager_unittest.cc b/content/renderer/p2p/filtering_network_manager_unittest.cc
index 7bd8e49..bdeaef60 100644
--- a/content/renderer/p2p/filtering_network_manager_unittest.cc
+++ b/content/renderer/p2p/filtering_network_manager_unittest.cc
@@ -10,8 +10,8 @@
#include <utility>
#include "base/logging.h"
-#include "base/macros.h"
#include "base/memory/ref_counted.h"
+#include "base/stl_util.h"
#include "base/test/test_simple_task_runner.h"
#include "base/threading/thread_task_runner_handle.h"
#include "content/renderer/p2p/empty_network_manager.h"
@@ -233,7 +233,7 @@
{MOCK_NETWORKS_CHANGED, NO_SIGNAL},
};
- RunTests(tests, arraysize(tests));
+ RunTests(tests, base::size(tests));
}
// Test that multiple routes request is blocked and signaled right after
@@ -259,7 +259,7 @@
{MOCK_NETWORKS_CHANGED, NO_SIGNAL},
};
- RunTests(tests, arraysize(tests));
+ RunTests(tests, base::size(tests));
}
// Test that multiple routes request is blocked and signaled right after
@@ -281,7 +281,7 @@
{MOCK_NETWORKS_CHANGED, NO_SIGNAL},
};
- RunTests(tests, arraysize(tests));
+ RunTests(tests, base::size(tests));
}
// Test that after permissions have been denied, a network change signal from
@@ -302,7 +302,7 @@
{MOCK_NETWORKS_CHANGED, NO_SIGNAL},
};
- RunTests(tests, arraysize(tests));
+ RunTests(tests, base::size(tests));
}
// Test that multiple routes request is granted and signaled right after
@@ -329,7 +329,7 @@
{MOCK_NETWORKS_CHANGED, NO_SIGNAL},
};
- RunTests(tests, arraysize(tests));
+ RunTests(tests, base::size(tests));
}
// Test that multiple routes request is granted and signaled right after
@@ -352,7 +352,7 @@
{MOCK_NETWORKS_CHANGED, NO_SIGNAL},
};
- RunTests(tests, arraysize(tests));
+ RunTests(tests, base::size(tests));
}
// Test that multiple routes request is granted and signaled right after
@@ -376,7 +376,7 @@
{MOCK_NETWORKS_CHANGED, NO_SIGNAL},
};
- RunTests(tests, arraysize(tests));
+ RunTests(tests, base::size(tests));
}
} // namespace content
diff --git a/content/renderer/pepper/pepper_audio_encoder_host.cc b/content/renderer/pepper/pepper_audio_encoder_host.cc
index 7a740801..bede139 100644
--- a/content/renderer/pepper/pepper_audio_encoder_host.cc
+++ b/content/renderer/pepper/pepper_audio_encoder_host.cc
@@ -8,8 +8,8 @@
#include <utility>
#include "base/bind.h"
-#include "base/macros.h"
#include "base/memory/shared_memory.h"
+#include "base/stl_util.h"
#include "content/public/renderer/renderer_ppapi_host.h"
#include "content/renderer/pepper/host_globals.h"
#include "content/renderer/render_thread_impl.h"
@@ -93,7 +93,7 @@
std::vector<PP_AudioProfileDescription> profiles;
static const uint32_t sampling_rates[] = {8000, 12000, 16000, 24000, 48000};
- for (uint32_t i = 0; i < arraysize(sampling_rates); ++i) {
+ for (uint32_t i = 0; i < base::size(sampling_rates); ++i) {
PP_AudioProfileDescription profile;
profile.profile = PP_AUDIOPROFILE_OPUS;
profile.max_channels = 2;
diff --git a/content/renderer/pepper/pepper_graphics_2d_host_unittest.cc b/content/renderer/pepper/pepper_graphics_2d_host_unittest.cc
index c2d365a..340dbc5 100644
--- a/content/renderer/pepper/pepper_graphics_2d_host_unittest.cc
+++ b/content/renderer/pepper/pepper_graphics_2d_host_unittest.cc
@@ -6,7 +6,7 @@
#include <stddef.h>
-#include "base/macros.h"
+#include "base/stl_util.h"
#include "base/test/scoped_task_environment.h"
#include "content/renderer/pepper/gfx_conversion.h"
#include "content/renderer/pepper/mock_renderer_ppapi_host.h"
@@ -136,7 +136,7 @@
// Check negative scroll deltas
{10, 10, 20, 20, 5, 5, 10, 10, -6, -4, -3, -2, 0.5, true},
{10, 10, 20, 20, 5, 5, 10, 10, -6, -3, -3, -1, 0.5, false}, };
- for (size_t i = 0; i < arraysize(tests); ++i) {
+ for (size_t i = 0; i < base::size(tests); ++i) {
gfx::Rect r1(tests[i].x1, tests[i].y1, tests[i].w1, tests[i].h1);
gfx::Rect r2(tests[i].x2, tests[i].y2, tests[i].w2, tests[i].h2);
gfx::Rect orig = r1;
diff --git a/content/renderer/render_frame_impl_browsertest.cc b/content/renderer/render_frame_impl_browsertest.cc
index b84b6ca..9eb54432 100644
--- a/content/renderer/render_frame_impl_browsertest.cc
+++ b/content/renderer/render_frame_impl_browsertest.cc
@@ -11,6 +11,7 @@
#include "base/command_line.h"
#include "base/debug/leak_annotations.h"
#include "base/run_loop.h"
+#include "base/stl_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/bind_test_util.h"
#include "base/test/gtest_util.h"
@@ -326,7 +327,7 @@
{blink::WebEffectiveConnectionType::kType2G},
{blink::WebEffectiveConnectionType::kType4G}};
- for (size_t i = 0; i < arraysize(tests); ++i) {
+ for (size_t i = 0; i < base::size(tests); ++i) {
SetEffectionConnectionType(GetMainRenderFrame(), tests[i].type);
SetEffectionConnectionType(frame(), tests[i].type);
diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc
index 6f75ddd..0d63fca 100644
--- a/content/renderer/render_view_browsertest.cc
+++ b/content/renderer/render_view_browsertest.cc
@@ -12,9 +12,9 @@
#include "base/json/json_reader.h"
#include "base/json/json_writer.h"
#include "base/location.h"
-#include "base/macros.h"
#include "base/run_loop.h"
#include "base/single_thread_task_runner.h"
+#include "base/stl_util.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/threading/thread_task_runner_handle.h"
@@ -155,7 +155,7 @@
{ MockKeyboard::RIGHT_ALT, ui::EF_ALT_DOWN },
};
int flags = 0;
- for (size_t i = 0; i < arraysize(kModifierMap); ++i) {
+ for (size_t i = 0; i < base::size(kModifierMap); ++i) {
if (kModifierMap[i].src & modifiers) {
flags |= kModifierMap[i].dst;
}
@@ -594,7 +594,7 @@
// Set up post data.
const char raw_data[] = "post \0\ndata";
- const size_t length = arraysize(raw_data);
+ const size_t length = base::size(raw_data);
scoped_refptr<network::ResourceRequestBody> post_data(
new network::ResourceRequestBody);
post_data->AppendBytes(raw_data, length);
@@ -727,7 +727,7 @@
blink::kWebNavigationTypeOther,
};
- for (size_t i = 0; i < arraysize(kNavTypes); ++i) {
+ for (size_t i = 0; i < base::size(kNavTypes); ++i) {
auto navigation_info = std::make_unique<blink::WebNavigationInfo>();
navigation_info->url_request = blink::WebURLRequest(GURL("http://foo.com"));
navigation_info->url_request.SetRequestorOrigin(
@@ -1287,7 +1287,7 @@
input_mode = p.mode;
EXPECT_EQ(ui::TEXT_INPUT_TYPE_PASSWORD, type);
- for (size_t i = 0; i < arraysize(kInputModeTestCases); i++) {
+ for (size_t i = 0; i < base::size(kInputModeTestCases); i++) {
const InputModeTestCase* test_case = &kInputModeTestCases[i];
std::string javascript =
base::StringPrintf("document.getElementById('%s').focus();",
@@ -1387,7 +1387,7 @@
{IME_FINISHCOMPOSINGTEXT, false, -1, -1, L"", L"\xC548\xB155"},
};
- for (size_t i = 0; i < arraysize(kImeMessages); i++) {
+ for (size_t i = 0; i < base::size(kImeMessages); i++) {
const ImeMessage* ime_message = &kImeMessages[i];
switch (ime_message->command) {
case IME_INITIALIZE:
@@ -1479,7 +1479,7 @@
{blink::kWebTextDirectionRightToLeft, L"rtl,rtl"},
{blink::kWebTextDirectionLeftToRight, L"ltr,ltr"},
};
- for (size_t i = 0; i < arraysize(kTextDirection); ++i) {
+ for (size_t i = 0; i < base::size(kTextDirection); ++i) {
// Set the text direction of the <textarea> element.
ExecuteJavaScriptForTests("document.getElementById('test').focus();");
ReceiveSetTextDirection(view()->GetWidget(), kTextDirection[i].direction);
diff --git a/content/shell/app/blink_test_platform_support_win.cc b/content/shell/app/blink_test_platform_support_win.cc
index 0252431..22d3e5c3 100644
--- a/content/shell/app/blink_test_platform_support_win.cc
+++ b/content/shell/app/blink_test_platform_support_win.cc
@@ -14,8 +14,8 @@
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/logging.h"
-#include "base/macros.h"
#include "base/path_service.h"
+#include "base/stl_util.h"
#include "base/strings/utf_string_conversions.h"
#include "ui/gfx/win/direct_write.h"
@@ -59,7 +59,7 @@
{&metrics.lfStatusFont, &metrics.lfMenuFont, &metrics.lfSmCaptionFont};
const wchar_t required_font[] = L"Segoe UI";
int required_font_size = -12;
- for (size_t i = 0; i < arraysize(system_fonts); ++i) {
+ for (size_t i = 0; i < base::size(system_fonts); ++i) {
if (system_fonts[i]->lfHeight != required_font_size ||
wcscmp(required_font, system_fonts[i]->lfFaceName)) {
errors.push_back("Must use either the Aero or Basic theme.");
diff --git a/content/shell/browser/shell_content_browser_client.cc b/content/shell/browser/shell_content_browser_client.cc
index a1647a127..02225da 100644
--- a/content/shell/browser/shell_content_browser_client.cc
+++ b/content/shell/browser/shell_content_browser_client.cc
@@ -13,8 +13,8 @@
#include "base/files/file.h"
#include "base/files/file_util.h"
#include "base/json/json_reader.h"
-#include "base/macros.h"
#include "base/path_service.h"
+#include "base/stl_util.h"
#include "base/strings/utf_string_conversions.h"
#include "build/build_config.h"
#include "content/public/browser/client_certificate_delegate.h"
@@ -182,7 +182,7 @@
url::kDataScheme,
url::kFileScheme,
};
- for (size_t i = 0; i < arraysize(kProtocolList); ++i) {
+ for (size_t i = 0; i < base::size(kProtocolList); ++i) {
if (url.scheme() == kProtocolList[i])
return true;
}
diff --git a/content/shell/browser/shell_download_manager_delegate.cc b/content/shell/browser/shell_download_manager_delegate.cc
index 65731c2..2ca93dab 100644
--- a/content/shell/browser/shell_download_manager_delegate.cc
+++ b/content/shell/browser/shell_download_manager_delegate.cc
@@ -15,7 +15,7 @@
#include "base/command_line.h"
#include "base/files/file_util.h"
#include "base/logging.h"
-#include "base/macros.h"
+#include "base/stl_util.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/task/post_task.h"
@@ -165,7 +165,7 @@
#if defined(OS_WIN)
std::wstring file_part = base::FilePath(suggested_path).BaseName().value();
wchar_t file_name[MAX_PATH];
- base::wcslcpy(file_name, file_part.c_str(), arraysize(file_name));
+ base::wcslcpy(file_name, file_part.c_str(), base::size(file_name));
OPENFILENAME save_as;
ZeroMemory(&save_as, sizeof(save_as));
save_as.lStructSize = sizeof(OPENFILENAME);
@@ -174,7 +174,7 @@
->GetHost()
->GetAcceleratedWidget();
save_as.lpstrFile = file_name;
- save_as.nMaxFile = arraysize(file_name);
+ save_as.nMaxFile = base::size(file_name);
std::wstring directory;
if (!suggested_path.empty())
diff --git a/content/shell/browser/shell_views.cc b/content/shell/browser/shell_views.cc
index ef4da07..cb407fb8 100644
--- a/content/shell/browser/shell_views.cc
+++ b/content/shell/browser/shell_views.cc
@@ -7,7 +7,7 @@
#include <stddef.h>
#include "base/command_line.h"
-#include "base/macros.h"
+#include "base/stl_util.h"
#include "base/strings/utf_string_conversions.h"
#include "build/build_config.h"
#include "content/public/browser/context_factory.h"
@@ -209,7 +209,7 @@
static const ui::KeyboardCode keys[] = { ui::VKEY_F5,
ui::VKEY_BROWSER_BACK,
ui::VKEY_BROWSER_FORWARD };
- for (size_t i = 0; i < arraysize(keys); ++i) {
+ for (size_t i = 0; i < base::size(keys); ++i) {
GetFocusManager()->RegisterAccelerator(
ui::Accelerator(keys[i], ui::EF_NONE),
ui::AcceleratorManager::kNormalPriority,
diff --git a/content/shell/browser/web_test/web_test_push_messaging_service.cc b/content/shell/browser/web_test/web_test_push_messaging_service.cc
index 1c5e704..4d7cb1d 100644
--- a/content/shell/browser/web_test/web_test_push_messaging_service.cc
+++ b/content/shell/browser/web_test/web_test_push_messaging_service.cc
@@ -6,7 +6,7 @@
#include "base/callback.h"
#include "base/logging.h"
-#include "base/macros.h"
+#include "base/stl_util.h"
#include "content/common/service_worker/service_worker_types.h"
#include "content/public/browser/permission_type.h"
#include "content/public/common/push_messaging_status.mojom.h"
@@ -83,9 +83,9 @@
if (permission_status == blink::mojom::PermissionStatus::GRANTED) {
std::vector<uint8_t> p256dh(kTestP256Key,
- kTestP256Key + arraysize(kTestP256Key));
+ kTestP256Key + base::size(kTestP256Key));
std::vector<uint8_t> auth(kAuthentication,
- kAuthentication + arraysize(kAuthentication));
+ kAuthentication + base::size(kAuthentication));
subscribed_service_worker_registration_ = service_worker_registration_id;
callback.Run("layoutTestRegistrationId", p256dh, auth,
@@ -104,9 +104,9 @@
const std::string& subscription_id,
const SubscriptionInfoCallback& callback) {
std::vector<uint8_t> p256dh(kTestP256Key,
- kTestP256Key + arraysize(kTestP256Key));
+ kTestP256Key + base::size(kTestP256Key));
std::vector<uint8_t> auth(kAuthentication,
- kAuthentication + arraysize(kAuthentication));
+ kAuthentication + base::size(kAuthentication));
callback.Run(true /* is_valid */, p256dh, auth);
}
diff --git a/content/shell/common/shell_origin_trial_policy.cc b/content/shell/common/shell_origin_trial_policy.cc
index b6e31223..64b20eb 100644
--- a/content/shell/common/shell_origin_trial_policy.cc
+++ b/content/shell/common/shell_origin_trial_policy.cc
@@ -5,6 +5,7 @@
#include "content/shell/common/shell_origin_trial_policy.h"
#include "base/feature_list.h"
+#include "base/stl_util.h"
#include "content/public/common/content_features.h"
#include "content/public/common/origin_util.h"
@@ -27,7 +28,7 @@
ShellOriginTrialPolicy::ShellOriginTrialPolicy()
: public_key_(base::StringPiece(
reinterpret_cast<const char*>(kOriginTrialPublicKey),
- arraysize(kOriginTrialPublicKey))) {}
+ base::size(kOriginTrialPublicKey))) {}
ShellOriginTrialPolicy::~ShellOriginTrialPolicy() {}
diff --git a/content/shell/test_runner/accessibility_controller.cc b/content/shell/test_runner/accessibility_controller.cc
index 2c2c0fb..146b573 100644
--- a/content/shell/test_runner/accessibility_controller.cc
+++ b/content/shell/test_runner/accessibility_controller.cc
@@ -6,7 +6,7 @@
#include <string>
-#include "base/macros.h"
+#include "base/stl_util.h"
#include "content/shell/test_runner/web_view_test_proxy.h"
#include "gin/handle.h"
#include "gin/object_template_builder.h"
@@ -199,7 +199,7 @@
};
local_frame->CallFunctionEvenIfScriptDisabled(
v8::Local<v8::Function>::New(isolate, notification_callback_),
- context->Global(), arraysize(argv), argv);
+ context->Global(), base::size(argv), argv);
}
void AccessibilityController::LogAccessibilityEvents() {
diff --git a/content/shell/test_runner/mock_grammar_check.cc b/content/shell/test_runner/mock_grammar_check.cc
index a3971ef..83c1def 100644
--- a/content/shell/test_runner/mock_grammar_check.cc
+++ b/content/shell/test_runner/mock_grammar_check.cc
@@ -9,7 +9,7 @@
#include <algorithm>
#include "base/logging.h"
-#include "base/macros.h"
+#include "base/stl_util.h"
#include "content/shell/test_runner/test_common.h"
#include "third_party/blink/public/platform/web_string.h"
#include "third_party/blink/public/web/web_text_checking_result.h"
@@ -46,7 +46,7 @@
{"the the adlj adaasj sdklj. there there", 33, 5},
{"zz apple orange.", 0, 16},
};
- for (size_t i = 0; i < arraysize(kGrammarErrors); ++i) {
+ for (size_t i = 0; i < base::size(kGrammarErrors); ++i) {
size_t offset = 0;
base::string16 error(
kGrammarErrors[i].text,
diff --git a/content/shell/test_runner/mock_spell_check.cc b/content/shell/test_runner/mock_spell_check.cc
index cfd7242a..db07974 100644
--- a/content/shell/test_runner/mock_spell_check.cc
+++ b/content/shell/test_runner/mock_spell_check.cc
@@ -9,7 +9,7 @@
#include <algorithm>
#include "base/logging.h"
-#include "base/macros.h"
+#include "base/stl_util.h"
#include "content/shell/test_runner/test_common.h"
namespace test_runner {
@@ -158,7 +158,7 @@
"ifmmp", "qwertyuiopasd", "qwertyuiopasdf", "upper case", "wellcome"};
misspelled_words_.clear();
- for (size_t i = 0; i < arraysize(misspelled_words); ++i)
+ for (size_t i = 0; i < base::size(misspelled_words); ++i)
misspelled_words_.push_back(
base::string16(misspelled_words[i],
misspelled_words[i] + strlen(misspelled_words[i])));
diff --git a/content/shell/test_runner/test_runner_for_specific_view.cc b/content/shell/test_runner/test_runner_for_specific_view.cc
index 8d34f2d..e01f88e 100644
--- a/content/shell/test_runner/test_runner_for_specific_view.cc
+++ b/content/shell/test_runner/test_runner_for_specific_view.cc
@@ -11,7 +11,7 @@
#include "base/bind_helpers.h"
#include "base/command_line.h"
#include "base/logging.h"
-#include "base/macros.h"
+#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
#include "build/build_config.h"
#include "cc/paint/paint_canvas.h"
@@ -290,7 +290,7 @@
argv[2] = blink::WebArrayBufferConverter::ToV8Value(
&buffer, context->Global(), isolate);
- PostV8CallbackWithArgs(std::move(callback), arraysize(argv), argv);
+ PostV8CallbackWithArgs(std::move(callback), base::size(argv), argv);
}
void TestRunnerForSpecificView::CopyImageAtAndCapturePixelsAsyncThen(
diff --git a/content/shell/test_runner/web_ax_object_proxy.cc b/content/shell/test_runner/web_ax_object_proxy.cc
index 695b6b6..2860354 100644
--- a/content/shell/test_runner/web_ax_object_proxy.cc
+++ b/content/shell/test_runner/web_ax_object_proxy.cc
@@ -6,7 +6,7 @@
#include <stddef.h>
-#include "base/macros.h"
+#include "base/stl_util.h"
#include "base/strings/stringprintf.h"
#include "gin/handle.h"
#include "third_party/blink/public/platform/web_float_rect.h"
@@ -851,7 +851,7 @@
};
frame->CallFunctionEvenIfScriptDisabled(
v8::Local<v8::Function>::New(isolate, notification_callback_),
- context->Global(), arraysize(argv), argv);
+ context->Global(), base::size(argv), argv);
}
void WebAXObjectProxy::Reset() {
diff --git a/content/test/mock_keyboard_driver_win.cc b/content/test/mock_keyboard_driver_win.cc
index 363a3d1..a2f6b7d 100644
--- a/content/test/mock_keyboard_driver_win.cc
+++ b/content/test/mock_keyboard_driver_win.cc
@@ -8,7 +8,7 @@
#include <string.h>
#include "base/logging.h"
-#include "base/macros.h"
+#include "base/stl_util.h"
#include "content/test/mock_keyboard.h"
namespace content {
@@ -103,7 +103,7 @@
{L"00001009", MockKeyboard::LAYOUT_CANADIAN_FRENCH},
};
- for (size_t i = 0; i < arraysize(kLanguageIDs); ++i) {
+ for (size_t i = 0; i < base::size(kLanguageIDs); ++i) {
if (layout == kLanguageIDs[i].keyboard_layout) {
HKL new_keyboard_layout = LoadKeyboardLayout(kLanguageIDs[i].language,
KLF_ACTIVATE);
@@ -143,7 +143,7 @@
{VK_RCONTROL, MockKeyboard::RIGHT_CONTROL},
{VK_RMENU, MockKeyboard::RIGHT_ALT},
};
- for (size_t i = 0; i < arraysize(kModifierMasks); ++i) {
+ for (size_t i = 0; i < base::size(kModifierMasks); ++i) {
const int kKeyDownMask = 0x80;
if (modifiers & kModifierMasks[i].mask)
keyboard_states_[kModifierMasks[i].key_code] = kKeyDownMask;
@@ -159,9 +159,9 @@
// the mofifiers.
CHECK(output);
wchar_t code[16];
- int length = ToUnicodeEx(key_code, MapVirtualKey(key_code, 0),
- &keyboard_states_[0], &code[0], arraysize(code), 0,
- active_keyboard_layout_);
+ int length =
+ ToUnicodeEx(key_code, MapVirtualKey(key_code, 0), &keyboard_states_[0],
+ &code[0], base::size(code), 0, active_keyboard_layout_);
if (length > 0)
output->assign(code);
return length;
