Let url filter test the scheme in urlContains/Equals/Prefix/Suffix criteria

chrome/common/extensions/matcher/url_matcher_unittest.cc

 // 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.
 
 #include "chrome/common/extensions/matcher/url_matcher.h"
 
 #include "base/string_util.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 308 matching lines @@
       "www.google.com", "/webhp"), url));
   EXPECT_FALSE(Matches(factory.CreateHostEqualsPathPrefixCondition(
         "", "/webhp"), url));
   EXPECT_TRUE(Matches(factory.CreateHostEqualsPathPrefixCondition(
         "www.google.com", ""), url));
   EXPECT_FALSE(Matches(factory.CreateHostEqualsPathPrefixCondition(
         "google.com", ""), url));
 }
 
 TEST(URLMatcherConditionFactoryTest, TestFullSearches) {
-  GURL gurl("https://www.google.com/webhp?sourceid=chrome-instant&ie=UTF-8"
+  GURL gurl("https://www.google.com:1234/webhp?sourceid=chrome-instant&ie=UTF-8"

[Yoyo Zhou, 2012/08/14 15:40:11]

Hmm, you added a port here, but none of the tests except for the equals test
would be affected by the port being removed or not. How about an
EXPECT_TRUE(...PrefixCondition("https://www.google.com/webhp"))
and
EXPECT_FALSE(...ContainsCondition(":1234"))

[battre, 2012/08/16 13:16:25]

Done.

       "&ion=1#hl=en&output=search&sclient=psy-ab&q=chrome%20is%20awesome");
   URLMatcherConditionFactory factory;
   std::string url = factory.CanonicalizeURLForFullSearches(gurl);
 
   EXPECT_TRUE(Matches(factory.CreateURLPrefixCondition(""), url));
-  EXPECT_TRUE(Matches(factory.CreateURLPrefixCondition("www.goog"), url));
-  EXPECT_TRUE(Matches(factory.CreateURLPrefixCondition("www.google.com"), url));
-  EXPECT_TRUE(
-      Matches(factory.CreateURLPrefixCondition(".www.google.com"), url));
-  EXPECT_TRUE(
-      Matches(factory.CreateURLPrefixCondition("www.google.com/"), url));
+  EXPECT_TRUE(Matches(factory.CreateURLPrefixCondition(
+      "https://www.goog"), url));
+  EXPECT_TRUE(Matches(factory.CreateURLPrefixCondition(
+      "https://www.google.com"), url));
+  EXPECT_TRUE(Matches(factory.CreateURLPrefixCondition(
+      "https://www.google.com/"), url));
+  EXPECT_FALSE( Matches(factory.CreateURLPrefixCondition(

[Yoyo Zhou, 2012/08/14 15:40:11]

nit: extra space after (

[battre, 2012/08/16 13:16:25]

Done.

+      "http://www.google.com"), url));
   EXPECT_FALSE(Matches(factory.CreateURLPrefixCondition("webhp"), url));
 
   EXPECT_TRUE(Matches(factory.CreateURLSuffixCondition(""), url));
   EXPECT_TRUE(Matches(factory.CreateURLSuffixCondition("ion=1"), url));
   EXPECT_FALSE(Matches(factory.CreateURLSuffixCondition("www"), url));
 
   EXPECT_TRUE(Matches(factory.CreateURLContainsCondition(""), url));
   EXPECT_TRUE(Matches(factory.CreateURLContainsCondition("www.goog"), url));
-  EXPECT_TRUE(Matches(factory.CreateURLContainsCondition(".www.goog"), url));
   EXPECT_TRUE(Matches(factory.CreateURLContainsCondition("webhp"), url));
   EXPECT_TRUE(Matches(factory.CreateURLContainsCondition("?"), url));
   EXPECT_TRUE(Matches(factory.CreateURLContainsCondition("sourceid"), url));
   EXPECT_TRUE(Matches(factory.CreateURLContainsCondition("ion=1"), url));
+  EXPECT_FALSE(Matches(factory.CreateURLContainsCondition(".www.goog"), url));
   EXPECT_FALSE(Matches(factory.CreateURLContainsCondition("foobar"), url));
   EXPECT_FALSE(Matches(factory.CreateURLContainsCondition("search"), url));
 
   EXPECT_TRUE(Matches(factory.CreateURLEqualsCondition(
-      "www.google.com/webhp?sourceid=chrome-instant&ie=UTF-8&ion=1"), url));
+      "https://www.google.com/webhp?sourceid=chrome-instant&ie=UTF-8&ion=1"),
+      url));
   EXPECT_FALSE(
-      Matches(factory.CreateURLEqualsCondition("www.google.com"), url));
+      Matches(factory.CreateURLEqualsCondition("https://www.google.com"), url));
 }
 
 
 //
 // URLMatcherConditionSet
 //
 
 TEST(URLMatcherConditionSetTest, Constructor) {
   URLMatcherConditionFactory factory;
   URLMatcherCondition m1 = factory.CreateHostSuffixCondition("example.com");
@@ skipping 122 matching lines @@
   // The cached singleton in matcher.condition_factory_ should be destroyed to
   // free memory.
   int patternId2 = factory->CreateHostSuffixCondition(
       "example.com").substring_pattern()->id();
   // If patternId1 and patternId2 are different that indicates that
   // matcher.condition_factory_ does not leak memory.
   EXPECT_NE(patternId1, patternId2);
 }
 
 }  // namespace extensions