Update URLPatternSet to contain a std::set instead of std::vector.

chrome/common/extensions/url_pattern_set_unittest.cc

 // Copyright (c) 2011 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/extension.h"
 
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-namespace {
-
-static void AssertEqualExtents(const URLPatternSet& extent1,
-                               const URLPatternSet& extent2) {
-  URLPatternList patterns1 = extent1.patterns();
-  URLPatternList patterns2 = extent2.patterns();
-  std::set<std::string> strings1;
-  EXPECT_EQ(patterns1.size(), patterns2.size());
-
-  for (size_t i = 0; i < patterns1.size(); ++i)
-    strings1.insert(patterns1.at(i).GetAsString());
-
-  std::set<std::string> strings2;
-  for (size_t i = 0; i < patterns2.size(); ++i)
-    strings2.insert(patterns2.at(i).GetAsString());
-
-  EXPECT_EQ(strings1, strings2);
-}
-
-} // namespace
-
 static const int kAllSchemes =
     URLPattern::SCHEME_HTTP |
     URLPattern::SCHEME_HTTPS |
     URLPattern::SCHEME_FILE |
     URLPattern::SCHEME_FTP |
     URLPattern::SCHEME_CHROMEUI;
 
 TEST(URLPatternSetTest, Empty) {
   URLPatternSet extent;
   EXPECT_FALSE(extent.MatchesURL(GURL("http://www.foo.com/bar")));
@@ skipping 48 matching lines @@
   extent1.AddPattern(URLPattern(kAllSchemes, "http://www.google.com/f*"));
   extent1.AddPattern(URLPattern(kAllSchemes, "http://www.yahoo.com/b*"));
 
   URLPatternSet expected;
   expected.AddPattern(URLPattern(kAllSchemes, "http://www.google.com/f*"));
   expected.AddPattern(URLPattern(kAllSchemes, "http://www.yahoo.com/b*"));
 
   // Union with an empty set.
   URLPatternSet result;
   URLPatternSet::CreateUnion(extent1, empty_extent, &result);
-  AssertEqualExtents(expected, result);
+  EXPECT_EQ(expected, result);
 
   // Union with a real set (including a duplicate).
   URLPatternSet extent2;
   extent2.AddPattern(URLPattern(kAllSchemes, "http://www.reddit.com/f*"));
   extent2.AddPattern(URLPattern(kAllSchemes, "http://www.yahoo.com/z*"));
   extent2.AddPattern(URLPattern(kAllSchemes, "http://www.google.com/f*"));
 
   expected.AddPattern(URLPattern(kAllSchemes, "http://www.reddit.com/f*"));
   expected.AddPattern(URLPattern(kAllSchemes, "http://www.yahoo.com/z*"));
   // CreateUnion does not filter out duplicates right now.
   expected.AddPattern(URLPattern(kAllSchemes, "http://www.google.com/f*"));
 
   result.ClearPatterns();
   URLPatternSet::CreateUnion(extent1, extent2, &result);
-  AssertEqualExtents(expected, result);
+  EXPECT_EQ(expected, result);
 }