Implemented proper support for checking schemes and requested resource types.

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

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_API_DECLARATIVE_WEBREQUEST_WEBREQUEST_CONDITION_ATTRIBUTE_H_
 #define CHROME_BROWSER_EXTENSIONS_API_DECLARATIVE_WEBREQUEST_WEBREQUEST_CONDITION_ATTRIBUTE_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/extensions/api/declarative_webrequest/request_stages.h"
 #include "chrome/common/extensions/api/experimental.declarative.h"
+#include "webkit/glue/resource_type.h"
 
 namespace base {
 class Value;
 }
 
 namespace net {
 class URLRequest;
 }
 
 namespace extensions {
 
 // Base class for all condition attributes of the declarative Web Request API
 // except for condition attribute to test URLPatterns.
 class WebRequestConditionAttribute {
  public:
   enum Type {
-    CONDITION_HAS_SCHEME
+    CONDITION_RESOURCE_TYPE
   };
 
   WebRequestConditionAttribute();
   virtual ~WebRequestConditionAttribute();
 
   // Factory method that creates a WebRequestConditionAttribute for the JSON
   // dictionary {|name|: |value|} passed by the extension API. Sets |error| and
   // returns NULL if something fails.
   // The ownership of |value| remains at the caller.
   static scoped_ptr<WebRequestConditionAttribute> Create(
@@ skipping 20 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(WebRequestConditionAttribute);
 };
 
 typedef std::vector<linked_ptr<WebRequestConditionAttribute> >
     WebRequestConditionAttributes;
 
 //
 // The following are concrete condition attributes.
 //
 
-// Condition that checks whether a URL has a specific scheme.
-// TODO(battre): Generalize this to allow checking for multiple schemes.
-// TODO(battre): Alternatively, move the scheme check into the URLMatcher.
-class WebRequestConditionAttributeHasScheme
+// Condition that checks whether a request is for a specific resource type.
+class WebRequestConditionAttributeResourceType
     : public WebRequestConditionAttribute {
  public:
-  virtual ~WebRequestConditionAttributeHasScheme();
+  virtual ~WebRequestConditionAttributeResourceType();
 
   static bool IsMatchingType(const std::string& instance_type);
 
   // Factory method, see WebRequestConditionAttribute::Create.
   static scoped_ptr<WebRequestConditionAttribute> Create(
       const std::string& name,
       const base::Value* value,
       std::string* error);
 
   // Implementation of WebRequestConditionAttribute:
   virtual int GetStages() const OVERRIDE;
   virtual bool IsFulfilled(net::URLRequest* request,
                            RequestStages request_stage) OVERRIDE;
   virtual Type GetType() const OVERRIDE;
 
  private:
-  explicit WebRequestConditionAttributeHasScheme(const std::string& pattern);
+  explicit WebRequestConditionAttributeResourceType(
+      const std::vector<ResourceType::Type>& types);
 
-  std::string pattern_;
+  std::vector<ResourceType::Type> types_;
 
-  DISALLOW_COPY_AND_ASSIGN(WebRequestConditionAttributeHasScheme);
+  DISALLOW_COPY_AND_ASSIGN(WebRequestConditionAttributeResourceType);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_DECLARATIVE_WEBREQUEST_WEBREQUEST_CONDITION_ATTRIBUTE_H_