Implemented proper support for checking schemes and requested resource types.

chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute.cc

Index: chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute.cc
diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute.cc b/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute.cc
index 18cd897a939e35dd37f164caaef4aca239075d93..426a7e38a6f45fa1552d9b6aa39723cd6a52e45b 100644
--- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute.cc
+++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute.cc
@@ -4,11 +4,15 @@
 
 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute.h"
 
+#include <algorithm>
+
 #include "base/logging.h"
 #include "base/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/api/declarative_webrequest/request_stages.h"
 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_constants.h"
+#include "chrome/browser/extensions/api/web_request/web_request_api_helpers.h"
+#include "content/public/browser/resource_request_info.h"
 #include "net/url_request/url_request.h"
 
 namespace {
@@ -17,6 +21,8 @@ const char kUnknownConditionAttribute[] = "Unknown matching condition: '%s'";
 const char kInvalidValue[] = "Condition '%s' has an invalid value";
 }
 
+namespace helpers = extension_web_request_api_helpers;
+
 namespace extensions {
 
 namespace keys = declarative_webrequest_constants;
@@ -32,7 +38,8 @@ WebRequestConditionAttribute::~WebRequestConditionAttribute() {}
 // static
 bool WebRequestConditionAttribute::IsKnownType(
     const std::string& instance_type) {
-  return WebRequestConditionAttributeHasScheme::IsMatchingType(instance_type);
+  return WebRequestConditionAttributeResourceType::IsMatchingType(
+      instance_type);
 }
 
 // static
@@ -41,8 +48,8 @@ WebRequestConditionAttribute::Create(
     const std::string& name,
     const base::Value* value,
     std::string* error) {
-  if (WebRequestConditionAttributeHasScheme::IsMatchingType(name)) {
-    return WebRequestConditionAttributeHasScheme::Create(name, value, error);
+  if (WebRequestConditionAttributeResourceType::IsMatchingType(name)) {
+    return WebRequestConditionAttributeResourceType::Create(name, value, error);
   }
 
   *error = base::StringPrintf(kUnknownConditionAttribute, name.c_str());
@@ -51,61 +58,77 @@ WebRequestConditionAttribute::Create(
 
 
 //
-// WebRequestConditionAttributeHasScheme
+// WebRequestConditionAttributeResourceType
 //
 
-WebRequestConditionAttributeHasScheme::WebRequestConditionAttributeHasScheme(
-    const std::string& pattern)
-    : pattern_(pattern) {}
+WebRequestConditionAttributeResourceType::
+WebRequestConditionAttributeResourceType(
+    const std::vector<ResourceType::Type>& types)
+    : types_(types) {}
 
-WebRequestConditionAttributeHasScheme::~WebRequestConditionAttributeHasScheme()
-{}
+WebRequestConditionAttributeResourceType::
+~WebRequestConditionAttributeResourceType() {}
 
 // static
-bool WebRequestConditionAttributeHasScheme::IsMatchingType(
+bool WebRequestConditionAttributeResourceType::IsMatchingType(
     const std::string& instance_type) {
-  return instance_type == keys::kSchemeKey;
+  return instance_type == keys::kResourceTypeKey;
 }
 
-//
-// WebRequestConditionAttributeHasScheme
-//
-
 // static
 scoped_ptr<WebRequestConditionAttribute>
-WebRequestConditionAttributeHasScheme::Create(
+WebRequestConditionAttributeResourceType::Create(
     const std::string& name,
     const base::Value* value,
     std::string* error) {
   DCHECK(IsMatchingType(name));
 
-  std::string scheme;
-  if (!value->GetAsString(&scheme)) {
-    *error = base::StringPrintf(kInvalidValue, keys::kSchemeKey);
+  const ListValue* value_as_list = 0;
+  if (!value->GetAsList(&value_as_list)) {
+    *error = base::StringPrintf(kInvalidValue, keys::kResourceTypeKey);
     return scoped_ptr<WebRequestConditionAttribute>(NULL);
   }
 
+  size_t number_types = value_as_list->GetSize();
+
+  std::vector<ResourceType::Type> passed_types(number_types);
+  for (size_t i = 0; i < number_types; ++i) {
+    std::string resource_type_string;
+    ResourceType::Type type = ResourceType::LAST_TYPE;
+    if (!value_as_list->GetString(i, &resource_type_string) ||
+        !helpers::ParseResourceType(resource_type_string, &type)) {
+      *error = base::StringPrintf(kInvalidValue, keys::kResourceTypeKey);
+      return scoped_ptr<WebRequestConditionAttribute>(NULL);
+    }
+    passed_types.push_back(type);
+  }
+
   return scoped_ptr<WebRequestConditionAttribute>(
-      new WebRequestConditionAttributeHasScheme(scheme));
+      new WebRequestConditionAttributeResourceType(passed_types));
 }
 
-int WebRequestConditionAttributeHasScheme::GetStages() const {
+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 WebRequestConditionAttributeHasScheme::IsFulfilled(
+bool WebRequestConditionAttributeResourceType::IsFulfilled(
     net::URLRequest* request,
     RequestStages request_stage) {
   if (!(request_stage & GetStages()))
     return false;
-  return request->url().scheme() == pattern_;
+  const content::ResourceRequestInfo* info =
+      content::ResourceRequestInfo::ForRequest(request);
+  if (!info)
+    return false;
+  return std::find(types_.begin(), types_.end(), info->GetResourceType()) !=
+      types_.end();
 }
 
 WebRequestConditionAttribute::Type
-WebRequestConditionAttributeHasScheme::GetType() const {
-  return CONDITION_HAS_SCHEME;
+WebRequestConditionAttributeResourceType::GetType() const {
+  return CONDITION_RESOURCE_TYPE;
 }
 
 }  // namespace extensions