Introduce WebRequestResourceType.

extensions/browser/api/declarative_webrequest/webrequest_condition_attribute.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/declarative_webrequest/webrequest_condition_attribute.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <utility>
@@ skipping 18 matching lines @@
 #include "net/base/static_cookie_policy.h"
 #include "net/http/http_request_headers.h"
 #include "net/http/http_util.h"
 #include "net/url_request/url_request.h"
 
 using base::CaseInsensitiveCompareASCII;
 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;
 
 namespace extensions {
 
 namespace {
 // Error messages.
 const char kInvalidValue[] = "Condition '*' has an invalid value";
 
@@ skipping 73 matching lines @@
   bool bad_message = false;
   return g_web_request_condition_attribute_factory.Get().factory.Instantiate(
       name, value, error, &bad_message);
 }
 
 //
 // WebRequestConditionAttributeResourceType
 //
 
 WebRequestConditionAttributeResourceType::
-WebRequestConditionAttributeResourceType(
-    const std::vector<ResourceType>& types)
+    WebRequestConditionAttributeResourceType(
+        const std::vector<WebRequestResourceType>& types)
     : types_(types) {}
 
 WebRequestConditionAttributeResourceType::
 ~WebRequestConditionAttributeResourceType() {}
 
 // static
 scoped_refptr<const WebRequestConditionAttribute>
 WebRequestConditionAttributeResourceType::Create(
     const std::string& instance_type,
     const base::Value* value,
     std::string* error,
     bool* bad_message) {
   DCHECK(instance_type == keys::kResourceTypeKey);
   const base::ListValue* value_as_list = NULL;
   if (!value->GetAsList(&value_as_list)) {
     *error = ErrorUtils::FormatErrorMessage(kInvalidValue,
                                             keys::kResourceTypeKey);
     return scoped_refptr<const WebRequestConditionAttribute>(NULL);
   }
 
   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;
     if (!value_as_list->GetString(i, &resource_type_string) ||
         !helpers::ParseResourceType(resource_type_string, &passed_types)) {
       *error = ErrorUtils::FormatErrorMessage(kInvalidValue,
                                               keys::kResourceTypeKey);
       return scoped_refptr<const WebRequestConditionAttribute>(NULL);
     }
   }
 
   return scoped_refptr<const WebRequestConditionAttribute>(
       new WebRequestConditionAttributeResourceType(passed_types));
 }
 
 int WebRequestConditionAttributeResourceType::GetStages() const {
   return ON_BEFORE_REQUEST | ON_BEFORE_SEND_HEADERS | ON_SEND_HEADERS |
       ON_HEADERS_RECEIVED | ON_AUTH_REQUIRED | ON_BEFORE_REDIRECT |
       ON_RESPONSE_STARTED | ON_COMPLETED | ON_ERROR;
 }
 
 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
 WebRequestConditionAttributeResourceType::GetType() const {
   return CONDITION_RESOURCE_TYPE;
 }
 
 std::string WebRequestConditionAttributeResourceType::GetName() const {
   return keys::kResourceTypeKey;
 }
@@ skipping 52 matching lines @@
 }
 
 int WebRequestConditionAttributeContentType::GetStages() const {
   return ON_HEADERS_RECEIVED;
 }
 
 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);
   std::string mime_type;
   std::string charset;
   bool had_charset = false;
   net::HttpUtil::ParseContentType(
       content_type, &mime_type, &charset, &had_charset, NULL);
 
   if (inclusive_) {
@@ skipping 604 matching lines @@
 bool WebRequestConditionAttributeStages::Equals(
     const WebRequestConditionAttribute* other) const {
   if (!WebRequestConditionAttribute::Equals(other))
     return false;
   const WebRequestConditionAttributeStages* casted_other =
       static_cast<const WebRequestConditionAttributeStages*>(other);
   return allowed_stages_ == casted_other->allowed_stages_;
 }
 
 }  // namespace extensions