diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-30 00:50:04 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-30 00:50:04 +0000 |
| commit | bdaab67c485eee51a098c7b34544c5d18bf725af (patch) | |
| tree | 31e0c087b57c538ef91b6598040f2b7f2293505d /chrome/common/content_settings_helper_unittest.cc | |
| parent | fbc7678b2f73707962861c99eb4c809604ddd611 (diff) | |
| download | chromium_src-bdaab67c485eee51a098c7b34544c5d18bf725af.zip chromium_src-bdaab67c485eee51a098c7b34544c5d18bf725af.tar.gz chromium_src-bdaab67c485eee51a098c7b34544c5d18bf725af.tar.bz2 | |
Remove wstring from TableModel.
BUG=23581
TEST=no visible changes; all tests pass
Review URL: http://codereview.chromium.org/6044007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70290 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/content_settings_helper_unittest.cc')
| -rw-r--r-- | chrome/common/content_settings_helper_unittest.cc | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/chrome/common/content_settings_helper_unittest.cc b/chrome/common/content_settings_helper_unittest.cc index d46eda6..f20a1a2 100644 --- a/chrome/common/content_settings_helper_unittest.cc +++ b/chrome/common/content_settings_helper_unittest.cc @@ -4,10 +4,11 @@ #include "chrome/common/content_settings_helper.h" +#include "base/utf_string_conversions.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" -TEST(ContentSettingsHelperTest, OriginToWString) { +TEST(ContentSettingsHelperTest, OriginToString16) { // Urls with "http": const GURL kUrl0("http://www.foo.com/bar"); const GURL kUrl1("http://foo.com/bar"); @@ -23,20 +24,24 @@ TEST(ContentSettingsHelperTest, OriginToWString) { const GURL kUrl7("https://foo.com:81/bar"); // Now check the first group of urls with just "http": - EXPECT_EQ(L"www.foo.com", content_settings_helper::OriginToWString(kUrl0)); - EXPECT_EQ(L"foo.com", content_settings_helper::OriginToWString(kUrl1)); + EXPECT_EQ(ASCIIToUTF16("www.foo.com"), + content_settings_helper::OriginToString16(kUrl0)); + EXPECT_EQ(ASCIIToUTF16("foo.com"), + content_settings_helper::OriginToString16(kUrl1)); - EXPECT_EQ(L"www.foo.com:81", content_settings_helper::OriginToWString(kUrl2)); - EXPECT_EQ(L"foo.com:81", content_settings_helper::OriginToWString(kUrl3)); + EXPECT_EQ(ASCIIToUTF16("www.foo.com:81"), + content_settings_helper::OriginToString16(kUrl2)); + EXPECT_EQ(ASCIIToUTF16("foo.com:81"), + content_settings_helper::OriginToString16(kUrl3)); // Now check the second group of urls with "https": - EXPECT_EQ(L"https://www.foo.com", - content_settings_helper::OriginToWString(kUrl4)); - EXPECT_EQ(L"https://foo.com", - content_settings_helper::OriginToWString(kUrl5)); - - EXPECT_EQ(L"https://www.foo.com:81", - content_settings_helper::OriginToWString(kUrl6)); - EXPECT_EQ(L"https://foo.com:81", - content_settings_helper::OriginToWString(kUrl7)); + EXPECT_EQ(ASCIIToUTF16("https://www.foo.com"), + content_settings_helper::OriginToString16(kUrl4)); + EXPECT_EQ(ASCIIToUTF16("https://foo.com"), + content_settings_helper::OriginToString16(kUrl5)); + + EXPECT_EQ(ASCIIToUTF16("https://www.foo.com:81"), + content_settings_helper::OriginToString16(kUrl6)); + EXPECT_EQ(ASCIIToUTF16("https://foo.com:81"), + content_settings_helper::OriginToString16(kUrl7)); } |