Adding condition attributes for request headers to Declarative WebRequest

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_
 
 #include <string>
 #include <vector>
 
@@ skipping 19 matching lines @@
 class HeaderMatcher;
 
 // 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_RESOURCE_TYPE,
     CONDITION_CONTENT_TYPE,
     CONDITION_RESPONSE_HEADERS,
-    CONDITION_THIRD_PARTY
+    CONDITION_THIRD_PARTY,
+    CONDITION_REQUEST_HEADERS
   };
 
   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 81 matching lines @@
   explicit WebRequestConditionAttributeContentType(
       const std::vector<std::string>& include_content_types,
       bool inclusive);
 
   std::vector<std::string> content_types_;
   bool inclusive_;
 
   DISALLOW_COPY_AND_ASSIGN(WebRequestConditionAttributeContentType);
 };
 
+// Condition attribute for matching against request headers. Uses HeaderMatcher
+// to handle the actual tests, in connection with a boolean positiveness
+// flag. If that flag is set to true, then IsFulfilled() returns true iff
+// |header_matcher_| matches at least one header. Otherwise IsFulfilled()
+// returns true iff the |header_matcher_| matches no header.
+class WebRequestConditionAttributeRequestHeaders
+    : public WebRequestConditionAttribute {
+ public:
+  virtual ~WebRequestConditionAttributeRequestHeaders();
+
+  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(
+      const WebRequestRule::RequestData& request_data) const OVERRIDE;
+  virtual Type GetType() const OVERRIDE;
+
+ private:
+  WebRequestConditionAttributeRequestHeaders(
+      scoped_ptr<const HeaderMatcher> header_matcher, bool positive);
+
+  const scoped_ptr<const HeaderMatcher> header_matcher_;
+  const bool positive_;
+
+  DISALLOW_COPY_AND_ASSIGN(WebRequestConditionAttributeRequestHeaders);
+};
+
 // Condition attribute for matching against response headers. Uses HeaderMatcher
 // to handle the actual tests, in connection with a boolean positiveness
 // flag. If that flag is set to true, then IsFulfilled() returns true iff
 // |header_matcher_| matches at least one header. Otherwise IsFulfilled()
 // returns true iff the |header_matcher_| matches no header.
 class WebRequestConditionAttributeResponseHeaders
     : public WebRequestConditionAttribute {
  public:
   virtual ~WebRequestConditionAttributeResponseHeaders();
 
   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(
       const WebRequestRule::RequestData& request_data) const OVERRIDE;
   virtual Type GetType() const OVERRIDE;
 
  private:
   WebRequestConditionAttributeResponseHeaders(
-      scoped_ptr<const HeaderMatcher>* header_matcher, bool positive);
+      scoped_ptr<const HeaderMatcher> header_matcher, bool positive);
 
   const scoped_ptr<const HeaderMatcher> header_matcher_;
   const bool positive_;
 
   DISALLOW_COPY_AND_ASSIGN(WebRequestConditionAttributeResponseHeaders);
 };
 
 // This condition tests whether the request origin is third-party.
 class WebRequestConditionAttributeThirdParty
     : public WebRequestConditionAttribute {
@@ skipping 18 matching lines @@
   explicit WebRequestConditionAttributeThirdParty(bool match_third_party);
 
   const bool match_third_party_;
 
   DISALLOW_COPY_AND_ASSIGN(WebRequestConditionAttributeThirdParty);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_DECLARATIVE_WEBREQUEST_WEBREQUEST_CONDITION_ATTRIBUTE_H_