content: ResourceType cleanup.

chrome/browser/extensions/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 "chrome/browser/extensions/api/web_request/web_request_api_helpers.h"
 
 #include <cmath>
 
 #include "base/bind.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 37 matching lines @@
   "sub_frame",
   "stylesheet",
   "script",
   "image",
   "object",
   "xmlhttprequest",
   "other",
   "other",
 };
 
-static ResourceType::Type kResourceTypeValues[] = {
-  ResourceType::MAIN_FRAME,
-  ResourceType::SUB_FRAME,
-  ResourceType::STYLESHEET,
-  ResourceType::SCRIPT,
-  ResourceType::IMAGE,
-  ResourceType::OBJECT,
-  ResourceType::XHR,
-  ResourceType::LAST_TYPE,  // represents "other"
+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_OBJECT,
+  content::RESOURCE_TYPE_XHR,
+  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.
-  ResourceType::LAST_TYPE,
+  content::RESOURCE_TYPE_LAST_TYPE,
 };
 
 COMPILE_ASSERT(
     arraysize(kResourceTypeStrings) == arraysize(kResourceTypeValues),
     keep_resource_types_in_sync);
 
 void ClearCacheOnNavigationOnUI() {
   WebCacheManager::GetInstance()->ClearCacheOnNavigation();
 }
 
@@ skipping 1094 matching lines @@
       credentials_set = true;
       winning_extension_id = (*delta)->extension_id;
     }
   }
   return credentials_set;
 }
 
 
 #define ARRAYEND(array) (array + arraysize(array))
 
-bool IsRelevantResourceType(ResourceType::Type type) {
-  ResourceType::Type* iter =
+bool IsRelevantResourceType(ResourceType type) {
+  ResourceType* iter =
       std::find(kResourceTypeValues, ARRAYEND(kResourceTypeValues), type);
   return iter != ARRAYEND(kResourceTypeValues);
 }
 
-const char* ResourceTypeToString(ResourceType::Type type) {
-  ResourceType::Type* iter =
+const char* ResourceTypeToString(ResourceType type) {
+  ResourceType* iter =
       std::find(kResourceTypeValues, ARRAYEND(kResourceTypeValues), type);
   if (iter == ARRAYEND(kResourceTypeValues))
     return "other";
 
   return kResourceTypeStrings[iter - kResourceTypeValues];
 }
 
 bool ParseResourceType(const std::string& type_str,
-                       ResourceType::Type* type) {
+                       ResourceType* type) {
   const char** iter =
       std::find(kResourceTypeStrings, ARRAYEND(kResourceTypeStrings), type_str);
   if (iter == ARRAYEND(kResourceTypeStrings))
     return false;
   *type = kResourceTypeValues[iter - kResourceTypeStrings];
   return true;
 }
 
 void ClearCacheOnNavigation() {
   if (content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)) {
@@ skipping 33 matching lines @@
   return net::HttpUtil::IsToken(name);
 }
 
 bool IsValidHeaderValue(const std::string& value) {
   // Just a sanity check: disallow NUL and CRLF.
   return value.find('\0') == std::string::npos &&
       value.find("\r\n") == std::string::npos;
 }
 
 }  // namespace extension_web_request_api_helpers