WebRequest API: add more resource types

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 <algorithm>
 #include <cmath>
 
 #include "base/bind.h"
@@ skipping 33 matching lines @@
 namespace extension_web_request_api_helpers {
 
 namespace {
 
 static const char* kResourceTypeStrings[] = {
   "main_frame",
   "sub_frame",
   "stylesheet",
   "script",
   "image",
+  "font",
   "object",
+  "script",
+  "script",
+  "image",
   "xmlhttprequest",
-  "other",
+  "ping",
+  "script",
+  "object",
   "other",
 };
 
 const size_t kResourceTypeStringsLength = arraysize(kResourceTypeStrings);
 
 static ResourceType kResourceTypeValues[] = {
   content::RESOURCE_TYPE_MAIN_FRAME,
   content::RESOURCE_TYPE_SUB_FRAME,
   content::RESOURCE_TYPE_STYLESHEET,
   content::RESOURCE_TYPE_SCRIPT,
   content::RESOURCE_TYPE_IMAGE,
+  content::RESOURCE_TYPE_FONT_RESOURCE,
   content::RESOURCE_TYPE_OBJECT,
+  content::RESOURCE_TYPE_WORKER,
+  content::RESOURCE_TYPE_SHARED_WORKER,
+  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"
-  // TODO(jochen): We duplicate the last entry, so the array's size is not a
-  // power of two. If it is, this triggers a bug in gcc 4.4 in Release builds
-  // (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43949). Once we use a version
-  // of gcc with this bug fixed, or the array is changed so this duplicate
-  // entry is no longer required, this should be removed.
-  content::RESOURCE_TYPE_LAST_TYPE,
 };
 
 const size_t kResourceTypeValuesLength = arraysize(kResourceTypeValues);
 
 typedef std::vector<linked_ptr<net::ParsedCookie> > ParsedResponseCookies;
 
 void ClearCacheOnNavigationOnUI() {
   web_cache::WebCacheManager::GetInstance()->ClearCacheOnNavigation();
 }
 
@@ skipping 1155 matching lines @@
   header->SetString(keys::kHeaderNameKey, name);
   if (base::IsStringUTF8(value)) {
     header->SetString(keys::kHeaderValueKey, value);
   } else {
     header->Set(keys::kHeaderBinaryValueKey,
                 StringToCharList(value));
   }
   return header;
 }
 
-#define ARRAYEND(array) (array + arraysize(array))
-
 bool IsRelevantResourceType(ResourceType type) {
   ResourceType* iter =
       std::find(kResourceTypeValues,
                 kResourceTypeValues + kResourceTypeValuesLength,
                 type);
   return iter != (kResourceTypeValues + kResourceTypeValuesLength);
 }
 
 const char* ResourceTypeToString(ResourceType type) {
   ResourceType* iter =
@@ skipping 12 matching lines @@
       std::find(kResourceTypeStrings,
                 kResourceTypeStrings + kResourceTypeStringsLength,
                 type_str);
   if (iter == (kResourceTypeStrings + kResourceTypeStringsLength))
     return false;
   *type = kResourceTypeValues[iter - kResourceTypeStrings];
   return true;
 }
 
 }  // namespace extension_web_request_api_helpers