Map webRequest filter type to multiple internal ResourceTypes if needed

extensions/browser/api/web_request/web_request_api_helpers.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "extensions/browser/api/web_request/web_request_api_helpers.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 31 matching lines @@
 using content::ResourceType;
 using net::cookie_util::ParsedRequestCookie;
 using net::cookie_util::ParsedRequestCookies;
 
 namespace keys = extension_web_request_api_constants;
 
 namespace extension_web_request_api_helpers {
 
 namespace {
 
+// Multiple ResourceTypes may map to the same string, but the converse is not
+// possible.
 static const char* kResourceTypeStrings[] = {
   "main_frame",
   "sub_frame",
   "stylesheet",
   "script",
   "image",
   "font",
   "object",
   "script",
   "script",
@@ skipping 20 matching lines @@
   content::RESOURCE_TYPE_FAVICON,
   content::RESOURCE_TYPE_XHR,
   content::RESOURCE_TYPE_PING,
   content::RESOURCE_TYPE_SERVICE_WORKER,
   content::RESOURCE_TYPE_PLUGIN_RESOURCE,
   content::RESOURCE_TYPE_LAST_TYPE,  // represents "other"
 };
 
 const size_t kResourceTypeValuesLength = arraysize(kResourceTypeValues);
 
+static_assert(kResourceTypeStringsLength == kResourceTypeValuesLength,
+              "Sizes of string lists and ResourceType lists should be equal");
+
 typedef std::vector<linked_ptr<net::ParsedCookie> > ParsedResponseCookies;
 
 void ClearCacheOnNavigationOnUI() {
   web_cache::WebCacheManager::GetInstance()->ClearCacheOnNavigation();
 }
 
 bool ParseCookieLifetime(net::ParsedCookie* cookie,
                          int64_t* seconds_till_expiry) {
   // 'Max-Age' is processed first because according to:
   // http://tools.ietf.org/html/rfc6265#section-5.3 'Max-Age' attribute
@@ skipping 1199 matching lines @@
       std::find(kResourceTypeValues,
                 kResourceTypeValues + kResourceTypeValuesLength,
                 type);
   if (iter == (kResourceTypeValues + kResourceTypeValuesLength))
     return "other";
 
   return kResourceTypeStrings[iter - kResourceTypeValues];
 }
 
 bool ParseResourceType(const std::string& type_str,
-                       ResourceType* type) {
-  const char** iter =
-      std::find(kResourceTypeStrings,
-                kResourceTypeStrings + kResourceTypeStringsLength,
-                type_str);
-  if (iter == (kResourceTypeStrings + kResourceTypeStringsLength))
-    return false;
-  *type = kResourceTypeValues[iter - kResourceTypeStrings];
-  return true;
+                       std::vector<ResourceType>* types) {
+  bool found = false;
+  for (size_t i = 0; i < kResourceTypeStringsLength; ++i) {
+    if (type_str == kResourceTypeStrings[i]) {
+      found = true;
+      types->push_back(kResourceTypeValues[i]);
+    }
+  }
+  return found;
 }
 
 }  // namespace extension_web_request_api_helpers