diff options
| author | jstritar@chromium.org <jstritar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-12 20:25:22 +0000 |
|---|---|---|
| committer | jstritar@chromium.org <jstritar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-12 20:25:22 +0000 |
| commit | b791effd60d54492f0e7cacf4c10d286fcd76ffe (patch) | |
| tree | d14aa43185a3f2c04951e1fd68c49bdf60e5ecd0 /chrome/common/extensions/extension_unittest.cc | |
| parent | f760afdeb4ce5e734c605719be2e66de048c5555 (diff) | |
| download | chromium_src-b791effd60d54492f0e7cacf4c10d286fcd76ffe.zip chromium_src-b791effd60d54492f0e7cacf4c10d286fcd76ffe.tar.gz chromium_src-b791effd60d54492f0e7cacf4c10d286fcd76ffe.tar.bz2 | |
Revert 92219 - Update URLPatternSet to contain a std::set instead of std::vector.
This updates URLPatternSet to contain a std::set instead of a std::vector, making it easier to implement the set operations in ExtensionPermissionSet.
BUG=84507
TEST=unit_tests
Review URL: http://codereview.chromium.org/7347011
TBR=jstritar@chromium.org
Review URL: http://codereview.chromium.org/7346019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92224 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/extensions/extension_unittest.cc')
| -rw-r--r-- | chrome/common/extensions/extension_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/common/extensions/extension_unittest.cc b/chrome/common/extensions/extension_unittest.cc index 9ad2a60..aa8555c 100644 --- a/chrome/common/extensions/extension_unittest.cc +++ b/chrome/common/extensions/extension_unittest.cc @@ -551,7 +551,7 @@ TEST(ExtensionTest, GetHostPermissionMessages_ManyHosts) { extension = LoadManifest("permissions", "many-hosts.json"); std::vector<string16> warnings = extension->GetPermissionMessageStrings(); ASSERT_EQ(1u, warnings.size()); - EXPECT_EQ("Your data on encrypted.google.com and www.google.com", + EXPECT_EQ("Your data on www.google.com and encrypted.google.com", UTF16ToUTF8(warnings[0])); } |