Introduce WebRequestEventRouterDelegate.

extensions/browser/api/web_request/web_request_api_utils.cc

Index: extensions/browser/api/web_request/web_request_api_utils.cc
diff --git a/extensions/browser/api/web_request/web_request_api_utils.cc b/extensions/browser/api/web_request/web_request_api_utils.cc
index a19bcd0e770c82ba844d2ddcfae6067df8bdccb4..2881b604a09035b9ff15a44682cc33b017b6ae2a 100644
--- a/extensions/browser/api/web_request/web_request_api_utils.cc
+++ b/extensions/browser/api/web_request/web_request_api_utils.cc
@@ -24,6 +24,8 @@ static const char* kResourceTypeStrings[] = {
   "other",
 };
 
+const size_t kResourceTypeStringsLength = arraysize(kResourceTypeStrings);
+
 static ResourceType kResourceTypeValues[] = {
   content::RESOURCE_TYPE_MAIN_FRAME,
   content::RESOURCE_TYPE_SUB_FRAME,
@@ -41,20 +43,26 @@ static ResourceType kResourceTypeValues[] = {
   content::RESOURCE_TYPE_LAST_TYPE,
 };
 
+const size_t kResourceTypeValuesLength = arraysize(kResourceTypeValues);
+
 }
 
 #define ARRAYEND(array) (array + arraysize(array))
 
 bool IsRelevantResourceType(ResourceType type) {
   ResourceType* iter =
-      std::find(kResourceTypeValues, ARRAYEND(kResourceTypeValues), type);
-  return iter != ARRAYEND(kResourceTypeValues);
+      std::find(kResourceTypeValues,
+                kResourceTypeValues + kResourceTypeValuesLength,
+                type);
+  return iter != (kResourceTypeValues + kResourceTypeValuesLength);
 }
 
 const char* ResourceTypeToString(ResourceType type) {
   ResourceType* iter =
-      std::find(kResourceTypeValues, ARRAYEND(kResourceTypeValues), type);
-  if (iter == ARRAYEND(kResourceTypeValues))
+      std::find(kResourceTypeValues,
+                kResourceTypeValues + kResourceTypeValuesLength,
+                type);
+  if (iter == (kResourceTypeValues + kResourceTypeValuesLength))
     return "other";
 
   return kResourceTypeStrings[iter - kResourceTypeValues];
@@ -63,8 +71,10 @@ const char* ResourceTypeToString(ResourceType type) {
 bool ParseResourceType(const std::string& type_str,
                        ResourceType* type) {
   const char** iter =
-      std::find(kResourceTypeStrings, ARRAYEND(kResourceTypeStrings), type_str);
-  if (iter == ARRAYEND(kResourceTypeStrings))
+      std::find(kResourceTypeStrings,
+                kResourceTypeStrings + kResourceTypeStringsLength,
+                type_str);
+  if (iter == (kResourceTypeStrings + kResourceTypeStringsLength))
     return false;
   *type = kResourceTypeValues[iter - kResourceTypeStrings];
   return true;