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

chrome/browser/extensions/user_script_master_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/browser/extensions/user_script_master.h"
 
 #include <string>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
 #include "base/string_util.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/test/testing_profile.h"
 #include "content/browser/browser_thread.h"
 #include "content/common/notification_registrar.h"
 #include "content/common/notification_service.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 bringing up a master on a specific directory, putting a script
 // in there, etc.
 
 class UserScriptMasterTest : public testing::Test,
                              public NotificationObserver {
  public:
   UserScriptMasterTest()
       : message_loop_(MessageLoop::TYPE_UI),
         shared_memory_(NULL) {
   }
@@ skipping 103 matching lines @@
   EXPECT_EQ("*foo*", script.globs()[0]);
 }
 
 TEST_F(UserScriptMasterTest, Parse4) {
   const std::string text(
     "// ==UserScript==\n"
     "// @match http://*.mail.google.com/*\n"
     "// @match  \t http://mail.yahoo.com/*\n"
     "// ==/UserScript==\n");
 
+  URLPatternSet expected_patterns;
+  AddPattern(&expected_patterns, "http://*.mail.google.com/*");
+  AddPattern(&expected_patterns, "http://mail.yahoo.com/*");
+
   UserScript script;
   EXPECT_TRUE(UserScriptMaster::ScriptReloader::ParseMetadataHeader(
       text, &script));
   EXPECT_EQ(0U, script.globs().size());
-  ASSERT_EQ(2U, script.url_patterns().size());
-  EXPECT_EQ("http://*.mail.google.com/*",
-            script.url_patterns()[0].GetAsString());
-  EXPECT_EQ("http://mail.yahoo.com/*",
-            script.url_patterns()[1].GetAsString());
+  EXPECT_EQ(expected_patterns, script.url_patterns());
 }
 
 TEST_F(UserScriptMasterTest, Parse5) {
   const std::string text(
     "// ==UserScript==\n"
     "// @match http://*mail.google.com/*\n"
     "// ==/UserScript==\n");
 
   // Invalid @match value.
   UserScript script;
@@ skipping 21 matching lines @@
     "adsasdfasf// @name hello\n"
     "  // @description\twiggity woo\n"
     "\t// @match  \t http://mail.yahoo.com/*\n"
     "// ==/UserScript==\n");
 
   UserScript script;
   EXPECT_TRUE(UserScriptMaster::ScriptReloader::ParseMetadataHeader(
       text, &script));
   ASSERT_EQ("hello", script.name());
   ASSERT_EQ("wiggity woo", script.description());
-  ASSERT_EQ(1U, script.url_patterns().size());
+  ASSERT_EQ(1U, script.url_patterns().patterns().size());
   EXPECT_EQ("http://mail.yahoo.com/*",
-            script.url_patterns()[0].GetAsString());
+            script.url_patterns().begin()->GetAsString());
 }
 
 TEST_F(UserScriptMasterTest, SkipBOMAtTheBeginning) {
   FilePath path = temp_dir_.path().AppendASCII("script.user.js");
   const std::string content("\xEF\xBB\xBF alert('hello');");
   size_t written = file_util::WriteFile(path, content.c_str(), content.size());
   ASSERT_EQ(written, content.size());
 
   UserScript user_script;
   user_script.js_scripts().push_back(UserScript::File(
@@ skipping 18 matching lines @@
   user_script.js_scripts().push_back(UserScript::File(
       temp_dir_.path(), path.BaseName(), GURL()));
 
   UserScriptList user_scripts;
   user_scripts.push_back(user_script);
 
   UserScriptMaster::ScriptReloader::LoadUserScripts(&user_scripts);
 
   EXPECT_EQ(content, user_scripts[0].js_scripts()[0].GetContent().as_string());
 }