Add support for matching query parameters in URLMatcher

components/url_matcher/url_matcher_unittest.cc

 // Copyright 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 "components/url_matcher/url_matcher.h"
 
 #include "base/strings/string_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
@@ skipping 51 matching lines @@
 
 TEST(URLMatcherConditionTest, IsFullURLCondition) {
   StringPattern pattern("example.com", 1);
   EXPECT_FALSE(URLMatcherCondition(URLMatcherCondition::HOST_SUFFIX,
       &pattern).IsFullURLCondition());
 
   EXPECT_TRUE(URLMatcherCondition(URLMatcherCondition::HOST_CONTAINS,
       &pattern).IsFullURLCondition());
   EXPECT_TRUE(URLMatcherCondition(URLMatcherCondition::PATH_CONTAINS,
       &pattern).IsFullURLCondition());
-  EXPECT_TRUE(URLMatcherCondition(URLMatcherCondition::QUERY_CONTAINS,
-      &pattern).IsFullURLCondition());
+  EXPECT_FALSE(URLMatcherCondition(URLMatcherCondition::QUERY_CONTAINS,
+                                   &pattern).IsFullURLCondition());
 
   EXPECT_TRUE(URLMatcherCondition(URLMatcherCondition::URL_PREFIX,
       &pattern).IsFullURLCondition());
   EXPECT_TRUE(URLMatcherCondition(URLMatcherCondition::URL_SUFFIX,
       &pattern).IsFullURLCondition());
   EXPECT_TRUE(URLMatcherCondition(URLMatcherCondition::URL_CONTAINS,
       &pattern).IsFullURLCondition());
   EXPECT_TRUE(URLMatcherCondition(URLMatcherCondition::URL_EQUALS,
       &pattern).IsFullURLCondition());
 }
@@ skipping 235 matching lines @@
   EXPECT_FALSE(Matches(factory.CreateQueryEqualsCondition(
       "sourceid=chrome-instant&ie=UTF-8&ion="), url));
   EXPECT_TRUE(Matches(factory.CreateQueryEqualsCondition(
       "sourceid=chrome-instant&ie=UTF-8&ion=1"), url));
   // The '?' at the beginning is just ignored.
   EXPECT_TRUE(Matches(factory.CreateQueryEqualsCondition(
       "?sourceid=chrome-instant&ie=UTF-8&ion=1"), url));
   EXPECT_FALSE(
       Matches(factory.CreateQueryEqualsCondition("www.google.com"), url));
 
+  EXPECT_FALSE(
+      Matches(factory.CreateQueryContainsCondition("www.google.com"), url));
+  EXPECT_TRUE(Matches(
+      factory.CreateQueryContainsCondition("sourceid=chrome-instant"), url));
+  // The '?' at the beginning is just ignored.
+  EXPECT_TRUE(Matches(
+      factory.CreateQueryContainsCondition("?sourceid=chrome-instant"), url));
+  EXPECT_TRUE(Matches(factory.CreateQueryContainsCondition("?ie=UTF-8"), url));
+  EXPECT_TRUE(Matches(factory.CreateQueryContainsCondition("ie=UTF-8"), url));
+  // Partial key value pairs not supported
+  EXPECT_FALSE(
+      Matches(factory.CreateQueryContainsCondition("t&ie=UTF-8"), url));
+  // Looks for an exact match, i.e., looks for "&e=UTF-8" or "?e=UTF-8" below
+  // and fails.
+  EXPECT_FALSE(Matches(factory.CreateQueryContainsCondition("e=UTF-8"), url));
+  // Multiple key value pairs are supported (though not very useful)

[battre, 2014/04/01 08:23:00]

I think the two previous occurrences are not 100% intuitive and should be
pointed out here: https://developer.chrome.com/extensions/events#type-UrlFilter

[kaliamoorthi, 2014/04/01 13:11:17]

Done.

+  EXPECT_TRUE(Matches(
+      factory.CreateQueryContainsCondition("sourceid=chrome-instant&ie=UTF-8"),
+      url));
 
   // Test adjacent components
   EXPECT_TRUE(Matches(factory.CreateHostSuffixPathPrefixCondition(
       "google.com", "/webhp"), url));
   EXPECT_TRUE(Matches(
       factory.CreateHostSuffixPathPrefixCondition(std::string(), "/webhp"),
       url));
   EXPECT_TRUE(Matches(
       factory.CreateHostSuffixPathPrefixCondition("google.com", std::string()),
       url));
@@ skipping 282 matching lines @@
   conditions.insert(factory->CreatePathSuffixCondition("hp"));
   conditions.insert(factory->CreatePathContainsCondition("hp"));
 
   conditions.insert(factory->CreateQueryEqualsCondition("test=val&a=b"));
   conditions.insert(factory->CreateQueryContainsCondition("test=val&a=b"));
 
   conditions.insert(factory->CreateQueryPrefixCondition("test=v"));
   conditions.insert(factory->CreateQueryContainsCondition("test=v"));
 
   conditions.insert(factory->CreateQuerySuffixCondition("l&a=b"));
-  conditions.insert(factory->CreateQueryContainsCondition("l&a=b"));
 
   // The '?' for equality is just ignored.
   conditions.insert(factory->CreateQueryEqualsCondition("?test=val&a=b"));
   // Due to '?' the condition created here is a prefix-testing condition.
   conditions.insert(factory->CreateQueryContainsCondition("?test=val&a=b"));
 
   const int kConditionSetId = 1;
   URLMatcherConditionSet::Vector insert;
   insert.push_back(make_scoped_refptr(
       new URLMatcherConditionSet(kConditionSetId, conditions)));
@@ skipping 31 matching lines @@
   conditions.insert(factory->CreateOriginAndPathMatchesCondition("val"));
   const int kConditionSetId = 1;
   URLMatcherConditionSet::Vector insert;
   insert.push_back(make_scoped_refptr(
       new URLMatcherConditionSet(kConditionSetId, conditions)));
   matcher.AddConditionSets(insert);
   EXPECT_EQ(0u, matcher.MatchURL(url).size());
 }
 
 }  // namespace url_matcher