Extracting header testing code from WebRequestConditionAttributeResponseHeaders.

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>
 
 #include "base/basictypes.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "chrome/browser/extensions/api/declarative_webrequest/request_stage.h"
 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_rule.h"
 #include "chrome/common/extensions/api/events.h"
 #include "webkit/glue/resource_type.h"
 
 namespace base {
 class Value;
 }
 
 namespace net {
 class URLRequest;
 }
 
 namespace extensions {
 
+class TestManager;

[Yoyo Zhou, 2012/09/01 19:44:50]

This name is kind of unclear. My first impression was that this was for unit
tests or some such. Can it be more descriptive, like FooTestManager? (I'm not
sure what the best foo is.) (And could Manager be more descriptive too?)

[vabr (Chromium), 2012/09/03 07:37:05]

Good point. I decided to get rid of "test" in the name as this has too many
meanings.
What about "HeaderMatcher"? It is used to match single headers against groups of
patterns. It is also independent of whether the headers are response headers or
request headers (and will be shared by code for both types), so I don't put any
restriction to one of those header types in the name.

+
 // 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
   };
 
@@ skipping 89 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 that performs matches against response headers' names and values.
-// In the comments below there is a distinction between when this condition is
-// "satisfied" and when it is "fulfilled". See the comments at |tests_| for
-// "satisfied" and the comment at |positive_test_| for "fulfilled".
+// Condition attribute for matching against response headers. Uses TestManager
+// to handle the actual tests, in connection with a boolean positiveness
+// flag. If that flag is set to true, then IsFulfilled() returns true iff
+// TestManager tests pass for at least one header. Otherwise IsFulfilled()
+// returns true iff no header passes the TestManager.
 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:
-  enum MatchType { kPrefix, kSuffix, kEquals, kContains };
+  WebRequestConditionAttributeResponseHeaders(
+      scoped_ptr<const TestManager>* test_manager, bool positive);
 
-  class StringMatchTest {
-   public:
-    StringMatchTest(const std::string& data, MatchType type);
-    ~StringMatchTest();
-
-    // Does |str| pass |*this| StringMatchTest?
-    bool Matches(const std::string& str) const;
-
-   private:
-    const std::string data_;
-    const MatchType type_;
-    DISALLOW_COPY_AND_ASSIGN(StringMatchTest);
-  };
-
-  class HeaderMatchTest {
-   public:
-    // Takes ownership of the content of both |name| and |value|.
-    HeaderMatchTest(ScopedVector<const StringMatchTest>* name,
-                    ScopedVector<const StringMatchTest>* value);
-    ~HeaderMatchTest();
-    // Does the header |name|: |value| match all tests in this header test?
-    bool Matches(const std::string& name, const std::string& value) const;
-
-   private:
-    // Tests to be passed by a header's name.
-    const ScopedVector<const StringMatchTest> name_;
-    // Tests to be passed by a header's value.
-    const ScopedVector<const StringMatchTest> value_;
-    DISALLOW_COPY_AND_ASSIGN(HeaderMatchTest);
-  };
-
-  WebRequestConditionAttributeResponseHeaders(
-      bool positive_test, ScopedVector<const HeaderMatchTest>* tests);
-
-  // Gets the tests' description in |tests| and creates the corresponding
-  // HeaderMatchTest. Returns NULL on failure.
-  static scoped_ptr<const HeaderMatchTest> CreateHeaderMatchTest(
-      const base::DictionaryValue* tests,
-      std::string* error);
-  // Helper to CreateHeaderMatchTest. Never returns NULL, except for memory
-  // failures.
-  static scoped_ptr<const StringMatchTest> CreateStringMatchTest(
-      const Value* content,
-      bool is_name_test,
-      MatchType match_type);
-
-  // The condition is satisfied if there is a header and its value such that for
-  // some |i| the header passes all the tests from |tests_[i]|.
-  ScopedVector<const HeaderMatchTest> tests_;
-
-  // True means that IsFulfilled() reports whether the condition is satisfied.
-  // False means that it reports whether the condition is NOT satisfied.
-  bool positive_test_;
+  const scoped_ptr<const TestManager> test_manager_;
+  const bool positive_;
 
   DISALLOW_COPY_AND_ASSIGN(WebRequestConditionAttributeResponseHeaders);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_DECLARATIVE_WEBREQUEST_WEBREQUEST_CONDITION_ATTRIBUTE_H_