Declarative Web Request: firstPartyForCookiesUrl

chrome/browser/extensions/api/declarative/declarative_rule_unittest.cc

 // Copyright (c) 2013 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 "chrome/browser/extensions/api/declarative/declarative_rule.h"
 
 #include "base/message_loop.h"
 #include "base/test/values_test_util.h"
 #include "base/values.h"
 #include "chrome/common/extensions/matcher/url_matcher_constants.h"
@@ skipping 17 matching lines @@
   typedef int MatchData;
 
   URLMatcherConditionFactory* factory;
   scoped_ptr<base::Value> value;
 
   void GetURLMatcherConditionSets(
       URLMatcherConditionSet::Vector* condition_sets) const {
     // No condition sets.
   }
 
-  bool has_url_matcher_condition_set() const {
-    return false;
-  }
-
   static scoped_ptr<RecordingCondition> Create(
       URLMatcherConditionFactory* url_matcher_condition_factory,
       const base::Value& condition,
       std::string* error) {
     const base::DictionaryValue* dict = NULL;
     if (condition.GetAsDictionary(&dict) && dict->HasKey("bad_key")) {
       *error = "Found error key";
       return scoped_ptr<RecordingCondition>();
     }
 
@@ skipping 33 matching lines @@
   EXPECT_EQ("", error);
   ASSERT_TRUE(result);
   EXPECT_EQ(2u, result->conditions().size());
 
   EXPECT_EQ(matcher.condition_factory(), result->conditions()[0]->factory);
   EXPECT_TRUE(ParseJson("{\"key\": 1}")->Equals(
       result->conditions()[0]->value.get()));
 }
 
 struct FulfillableCondition {
-  typedef int MatchData;
+  struct MatchData {
+    int value;
+    const std::set<URLMatcherConditionSet::ID>& url_matches;
+  };
 
   scoped_refptr<URLMatcherConditionSet> condition_set;
   int condition_set_id;
   int max_value;
 
   URLMatcherConditionSet::ID url_matcher_condition_set_id() const {
     return condition_set_id;
   }
 
-  bool has_url_matcher_condition_set() const {
-    return true;
-  }
-
   scoped_refptr<URLMatcherConditionSet> url_matcher_condition_set() const {
     return condition_set;
   }
 
   void GetURLMatcherConditionSets(
       URLMatcherConditionSet::Vector* condition_sets) const {
     if (condition_set)
       condition_sets->push_back(condition_set);
   }
 
-  bool IsFulfilled(const std::set<URLMatcherConditionSet::ID>& url_matches,
-                   int match_data) const {
-    if (condition_set_id != -1 && !ContainsKey(url_matches, condition_set_id))
+  bool IsFulfilled(const MatchData& match_data) const {
+    if (condition_set_id != -1 &&
+        !ContainsKey(match_data.url_matches, condition_set_id))
       return false;
-    return match_data <= max_value;
+    return match_data.value <= max_value;
   }
 
   static scoped_ptr<FulfillableCondition> Create(
-      URLMatcherConditionFactory* url_matcher_condition_factory,
+      URLMatcherConditionFactory* /*url_matcher_condition_factory*/,
       const base::Value& condition,
       std::string* error) {
     scoped_ptr<FulfillableCondition> result(new FulfillableCondition());
     const base::DictionaryValue* dict;
     if (!condition.GetAsDictionary(&dict)) {
       *error = "Expected dict";
       return result.Pass();
     }
     if (!dict->GetInteger("url_id", &result->condition_set_id))
       result->condition_set_id = -1;
@@ skipping 22 matching lines @@
 
   // Test insertion
   std::string error;
   scoped_ptr<FulfillableConditionSet> result =
       FulfillableConditionSet::Create(NULL, conditions, &error);
   ASSERT_EQ("", error);
   ASSERT_TRUE(result);
   EXPECT_EQ(4u, result->conditions().size());
 
   std::set<URLMatcherConditionSet::ID> url_matches;
-  EXPECT_FALSE(result->IsFulfilled(1, url_matches, 0))
+  FulfillableCondition::MatchData match_data = { 0, url_matches };
+  EXPECT_FALSE(result->IsFulfilled(1, match_data))
       << "Testing an ID that's not in url_matches forwards to the Condition, "
       << "which doesn't match.";
-  EXPECT_FALSE(result->IsFulfilled(-1, url_matches, 0))
+  EXPECT_FALSE(result->IsFulfilled(-1, match_data))
       << "Testing the 'no ID' value tries to match the 4th condition, but "
       << "its max is too low.";
-  EXPECT_TRUE(result->IsFulfilled(-1, url_matches, -5))
+  match_data.value = -5;
+  EXPECT_TRUE(result->IsFulfilled(-1, match_data))
       << "Testing the 'no ID' value tries to match the 4th condition, and "
       << "this value is low enough.";
 
   url_matches.insert(1);
-  EXPECT_TRUE(result->IsFulfilled(1, url_matches, 3))
+  match_data.value = 3;
+  EXPECT_TRUE(result->IsFulfilled(1, match_data))
       << "Tests a condition with a url matcher, for a matching value.";
-  EXPECT_FALSE(result->IsFulfilled(1, url_matches, 4))
+  match_data.value = 4;
+  EXPECT_FALSE(result->IsFulfilled(1, match_data))
       << "Tests a condition with a url matcher, for a non-matching value "
       << "that would match a different condition.";
   url_matches.insert(2);
-  EXPECT_TRUE(result->IsFulfilled(2, url_matches, 4))
+  EXPECT_TRUE(result->IsFulfilled(2, match_data))
       << "Tests with 2 elements in the match set.";
 
   // Check the condition sets:
   URLMatcherConditionSet::Vector condition_sets;
   result->GetURLMatcherConditionSets(&condition_sets);
   ASSERT_EQ(3U, condition_sets.size());
   EXPECT_EQ(1, condition_sets[0]->id());
   EXPECT_EQ(2, condition_sets[1]->id());
   EXPECT_EQ(3, condition_sets[2]->id());
 }
@@ skipping 187 matching lines @@
                  "  \"priority\": 200 \n"
                  "}"),
       json_rule.get()));
   rule = Rule::Create(matcher.condition_factory(), kExtensionId, base::Time(),
                       json_rule, &AtLeastOneCondition, &error);
   EXPECT_FALSE(rule);
   EXPECT_EQ("No conditions", error);
 }
 
 }  // namespace extensions