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

chrome/browser/extensions/convert_user_script_unittest.cc

Index: chrome/browser/extensions/convert_user_script_unittest.cc
diff --git a/chrome/browser/extensions/convert_user_script_unittest.cc b/chrome/browser/extensions/convert_user_script_unittest.cc
index a8aab8ffd9d3dd90674eefcc3dc1e83799e02b59..38b106abda3665a505b7dda7bcfa061906d2f13e 100644
--- a/chrome/browser/extensions/convert_user_script_unittest.cc
+++ b/chrome/browser/extensions/convert_user_script_unittest.cc
@@ -15,6 +15,15 @@
 #include "chrome/common/extensions/extension.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+namespace {
+
+static void AddPattern(URLPatternSet* extent, const std::string& pattern) {
+  int schemes = URLPattern::SCHEME_ALL;
+  extent->AddPattern(URLPattern(schemes, pattern));
+}
+
+}
+
 TEST(ExtensionFromUserScript, Basic) {
   FilePath test_file;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_file));
@@ -47,8 +56,9 @@ TEST(ExtensionFromUserScript, Basic) {
   EXPECT_EQ("http://www.yahoo.com/*", script.globs().at(1));
   ASSERT_EQ(1u, script.exclude_globs().size());
   EXPECT_EQ("*foo*", script.exclude_globs().at(0));
-  ASSERT_EQ(1u, script.url_patterns().size());
-  EXPECT_EQ("http://www.google.com/*", script.url_patterns()[0].GetAsString());
+  ASSERT_EQ(1u, script.url_patterns().patterns().size());
+  EXPECT_EQ("http://www.google.com/*",
+            script.url_patterns().begin()->GetAsString());
 
   // Make sure the files actually exist on disk.
   EXPECT_TRUE(file_util::PathExists(
@@ -86,9 +96,11 @@ TEST(ExtensionFromUserScript, NoMetdata) {
   ASSERT_EQ(1u, script.globs().size());
   EXPECT_EQ("*", script.globs()[0]);
   EXPECT_EQ(0u, script.exclude_globs().size());
-  ASSERT_EQ(2u, script.url_patterns().size());
-  EXPECT_EQ("http://*/*", script.url_patterns()[0].GetAsString());
-  EXPECT_EQ("https://*/*", script.url_patterns()[1].GetAsString());
+
+  URLPatternSet expected;
+  AddPattern(&expected, "http://*/*");
+  AddPattern(&expected, "https://*/*");
+  EXPECT_EQ(expected, script.url_patterns());
 
   // Make sure the files actually exist on disk.
   EXPECT_TRUE(file_util::PathExists(