Introduce WebRequestResourceType.

extensions/browser/api/declarative_webrequest/webrequest_condition_attribute.cc

Index: extensions/browser/api/declarative_webrequest/webrequest_condition_attribute.cc
diff --git a/extensions/browser/api/declarative_webrequest/webrequest_condition_attribute.cc b/extensions/browser/api/declarative_webrequest/webrequest_condition_attribute.cc
index 4c4d183ae1003d1de7d7610d827353c9f66bb49d..449f2a475e7f0d8769a05268b1b56958ee2e098d 100644
--- a/extensions/browser/api/declarative_webrequest/webrequest_condition_attribute.cc
+++ b/extensions/browser/api/declarative_webrequest/webrequest_condition_attribute.cc
@@ -36,7 +36,6 @@ using base::DictionaryValue;
 using base::ListValue;
 using base::StringValue;
 using base::Value;
-using content::ResourceType;
 
 namespace helpers = extension_web_request_api_helpers;
 namespace keys = extensions::declarative_webrequest_constants;
@@ -130,8 +129,8 @@ WebRequestConditionAttribute::Create(
 //
 
 WebRequestConditionAttributeResourceType::
-WebRequestConditionAttributeResourceType(
-    const std::vector<ResourceType>& types)
+    WebRequestConditionAttributeResourceType(
+        const std::vector<WebRequestResourceType>& types)
     : types_(types) {}
 
 WebRequestConditionAttributeResourceType::
@@ -154,7 +153,7 @@ WebRequestConditionAttributeResourceType::Create(
 
   size_t number_types = value_as_list->GetSize();
 
-  std::vector<ResourceType> passed_types;
+  std::vector<WebRequestResourceType> passed_types;
   passed_types.reserve(number_types);
   for (size_t i = 0; i < number_types; ++i) {
     std::string resource_type_string;
@@ -180,12 +179,13 @@ bool WebRequestConditionAttributeResourceType::IsFulfilled(
     const WebRequestData& request_data) const {
   if (!(request_data.stage & GetStages()))
     return false;
+
   const content::ResourceRequestInfo* info =
       content::ResourceRequestInfo::ForRequest(request_data.request);
-  if (!info)
-    return false;
-  return std::find(types_.begin(), types_.end(), info->GetResourceType()) !=
-      types_.end();
+  return info &&
+         std::find(types_.begin(), types_.end(),
+                   ToWebRequestResourceType(info->GetResourceType())) !=

[Devlin, 2017/02/16 16:08:26]

This seems like a place where we should be using the other variant of this
function so that we can account for WebSockets (and since we fetch the
ResourceRequestInfo).

That said, it looks like |info| can be null here (assuming the check wasn't
erroneous), which makes it a little more painful.

I think the simplest way to do this would be to add a
WebRequestResourceType::INVALID that can be returned when it's not a web socket
request there's no associated ResourceRequestInfo.  Then, |types_| here should
never include that, and we could just make this whole function

return (request_data.stage & GetStages()) != 0 &&
       std::find(types_.begin(), types_.end(),
                 GetWebRequestResourceType(request_data.request)) !=
           types_.end();

[pkalinnikov, 2017/02/16 19:27:32]

SGTM. How about UNDEFINED?

+             types_.end();
 }
 
 WebRequestConditionAttribute::Type
@@ -258,6 +258,7 @@ bool WebRequestConditionAttributeContentType::IsFulfilled(
     const WebRequestData& request_data) const {
   if (!(request_data.stage & GetStages()))
     return false;
+
   std::string content_type;
   request_data.original_response_headers->GetNormalizedHeader(
       net::HttpRequestHeaders::kContentType, &content_type);