Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(580)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/base/registry_controlled_domain_unittest.cc

Issue 6898026: Eliminate wstring from base/utf_offset_string_conversions.h, net/base/escape.h, and net/base/net_... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« net/base/net_util.cc ('K') | « net/base/registry_controlled_domain.cc ('k') | net/base/sdch_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/registry_controlled_domain_unittest.cc
===================================================================
--- net/base/registry_controlled_domain_unittest.cc (revision 82762)
+++ net/base/registry_controlled_domain_unittest.cc (working copy)
@@ -55,7 +55,7 @@
return TestRegistryControlledDomainService::GetDomainAndRegistry(GURL(url));
}
-std::string GetDomainFromHost(const std::wstring& host) {
+std::string GetDomainFromHost(const std::string& host) {
return TestRegistryControlledDomainService::GetDomainAndRegistry(host);
}
@@ -65,7 +65,7 @@
allow_unknown_registries);
}
-size_t GetRegistryLengthFromHost(const std::wstring& host,
+size_t GetRegistryLengthFromHost(const std::string& host,
bool allow_unknown_registries) {
return TestRegistryControlledDomainService::GetRegistryLength(host,
allow_unknown_registries);
@@ -113,28 +113,28 @@
// Test std::wstring version of GetDomainAndRegistry(). Uses the same
// underpinnings as the GURL version, so this is really more of a check of
// CanonicalizeHost().
- EXPECT_EQ("baz.jp", GetDomainFromHost(L"a.baz.jp")); // 1
- EXPECT_EQ("baz.jp.", GetDomainFromHost(L"a.baz.jp.")); // 1
- EXPECT_EQ("", GetDomainFromHost(L"ac.jp")); // 2
- EXPECT_EQ("", GetDomainFromHost(L"a.bar.jp")); // 3
- EXPECT_EQ("", GetDomainFromHost(L"bar.jp")); // 3
- EXPECT_EQ("", GetDomainFromHost(L"baz.bar.jp")); // 3 4
- EXPECT_EQ("a.b.baz.bar.jp", GetDomainFromHost(L"a.b.baz.bar.jp")); // 3 4
- EXPECT_EQ("pref.bar.jp", GetDomainFromHost(L"baz.pref.bar.jp")); // 5
- EXPECT_EQ("b.bar.baz.com.", GetDomainFromHost(L"a.b.bar.baz.com.")); // 6
- EXPECT_EQ("a.d.c", GetDomainFromHost(L"a.d.c")); // 7
- EXPECT_EQ("a.d.c", GetDomainFromHost(L".a.d.c")); // 7
- EXPECT_EQ("a.d.c", GetDomainFromHost(L"..a.d.c")); // 7
- EXPECT_EQ("b.c", GetDomainFromHost(L"a.b.c")); // 7 8
- EXPECT_EQ("baz.com", GetDomainFromHost(L"baz.com")); // none
- EXPECT_EQ("baz.com.", GetDomainFromHost(L"baz.com.")); // none
+ EXPECT_EQ("baz.jp", GetDomainFromHost("a.baz.jp")); // 1
+ EXPECT_EQ("baz.jp.", GetDomainFromHost("a.baz.jp.")); // 1
+ EXPECT_EQ("", GetDomainFromHost("ac.jp")); // 2
+ EXPECT_EQ("", GetDomainFromHost("a.bar.jp")); // 3
+ EXPECT_EQ("", GetDomainFromHost("bar.jp")); // 3
+ EXPECT_EQ("", GetDomainFromHost("baz.bar.jp")); // 3 4
+ EXPECT_EQ("a.b.baz.bar.jp", GetDomainFromHost("a.b.baz.bar.jp")); // 3 4
+ EXPECT_EQ("pref.bar.jp", GetDomainFromHost("baz.pref.bar.jp")); // 5
+ EXPECT_EQ("b.bar.baz.com.", GetDomainFromHost("a.b.bar.baz.com.")); // 6
+ EXPECT_EQ("a.d.c", GetDomainFromHost("a.d.c")); // 7
+ EXPECT_EQ("a.d.c", GetDomainFromHost(".a.d.c")); // 7
+ EXPECT_EQ("a.d.c", GetDomainFromHost("..a.d.c")); // 7
+ EXPECT_EQ("b.c", GetDomainFromHost("a.b.c")); // 7 8
+ EXPECT_EQ("baz.com", GetDomainFromHost("baz.com")); // none
+ EXPECT_EQ("baz.com.", GetDomainFromHost("baz.com.")); // none
- EXPECT_EQ("", GetDomainFromHost(L""));
- EXPECT_EQ("", GetDomainFromHost(L"foo.com.."));
- EXPECT_EQ("", GetDomainFromHost(L"..."));
- EXPECT_EQ("", GetDomainFromHost(L"192.168.0.1"));
- EXPECT_EQ("", GetDomainFromHost(L"localhost."));
- EXPECT_EQ("", GetDomainFromHost(L".localhost."));
+ EXPECT_EQ("", GetDomainFromHost(""));
+ EXPECT_EQ("", GetDomainFromHost("foo.com.."));
+ EXPECT_EQ("", GetDomainFromHost("..."));
+ EXPECT_EQ("", GetDomainFromHost("192.168.0.1"));
+ EXPECT_EQ("", GetDomainFromHost("localhost."));
+ EXPECT_EQ("", GetDomainFromHost(".localhost."));
}
TEST_F(RegistryControlledDomainTest, TestGetRegistryLength) {
@@ -181,33 +181,32 @@
// Test std::wstring version of GetRegistryLength(). Uses the same
// underpinnings as the GURL version, so this is really more of a check of
// CanonicalizeHost().
- EXPECT_EQ(2U, GetRegistryLengthFromHost(L"a.baz.jp", false)); // 1
- EXPECT_EQ(3U, GetRegistryLengthFromHost(L"a.baz.jp.", false)); // 1
- EXPECT_EQ(0U, GetRegistryLengthFromHost(L"ac.jp", false)); // 2
- EXPECT_EQ(0U, GetRegistryLengthFromHost(L"a.bar.jp", false)); // 3
- EXPECT_EQ(0U, GetRegistryLengthFromHost(L"bar.jp", false)); // 3
- EXPECT_EQ(0U, GetRegistryLengthFromHost(L"baz.bar.jp", false)); // 3 4
- EXPECT_EQ(12U, GetRegistryLengthFromHost(L"a.b.baz.bar.jp", false)); // 4
- EXPECT_EQ(6U, GetRegistryLengthFromHost(L"baz.pref.bar.jp", false)); // 5
- EXPECT_EQ(11U, GetRegistryLengthFromHost(L"a.b.bar.baz.com", false));
- // 6
- EXPECT_EQ(3U, GetRegistryLengthFromHost(L"a.d.c", false)); // 7
- EXPECT_EQ(3U, GetRegistryLengthFromHost(L".a.d.c", false)); // 7
- EXPECT_EQ(3U, GetRegistryLengthFromHost(L"..a.d.c", false)); // 7
- EXPECT_EQ(1U, GetRegistryLengthFromHost(L"a.b.c", false)); // 7 8
- EXPECT_EQ(0U, GetRegistryLengthFromHost(L"baz.com", false)); // none
- EXPECT_EQ(0U, GetRegistryLengthFromHost(L"baz.com.", false)); // none
- EXPECT_EQ(3U, GetRegistryLengthFromHost(L"baz.com", true)); // none
- EXPECT_EQ(4U, GetRegistryLengthFromHost(L"baz.com.", true)); // none
+ EXPECT_EQ(2U, GetRegistryLengthFromHost("a.baz.jp", false)); // 1
+ EXPECT_EQ(3U, GetRegistryLengthFromHost("a.baz.jp.", false)); // 1
+ EXPECT_EQ(0U, GetRegistryLengthFromHost("ac.jp", false)); // 2
+ EXPECT_EQ(0U, GetRegistryLengthFromHost("a.bar.jp", false)); // 3
+ EXPECT_EQ(0U, GetRegistryLengthFromHost("bar.jp", false)); // 3
+ EXPECT_EQ(0U, GetRegistryLengthFromHost("baz.bar.jp", false)); // 3 4
+ EXPECT_EQ(12U, GetRegistryLengthFromHost("a.b.baz.bar.jp", false)); // 4
+ EXPECT_EQ(6U, GetRegistryLengthFromHost("baz.pref.bar.jp", false)); // 5
+ EXPECT_EQ(11U, GetRegistryLengthFromHost("a.b.bar.baz.com", false)); // 6
+ EXPECT_EQ(3U, GetRegistryLengthFromHost("a.d.c", false)); // 7
+ EXPECT_EQ(3U, GetRegistryLengthFromHost(".a.d.c", false)); // 7
+ EXPECT_EQ(3U, GetRegistryLengthFromHost("..a.d.c", false)); // 7
+ EXPECT_EQ(1U, GetRegistryLengthFromHost("a.b.c", false)); // 7 8
+ EXPECT_EQ(0U, GetRegistryLengthFromHost("baz.com", false)); // none
+ EXPECT_EQ(0U, GetRegistryLengthFromHost("baz.com.", false)); // none
+ EXPECT_EQ(3U, GetRegistryLengthFromHost("baz.com", true)); // none
+ EXPECT_EQ(4U, GetRegistryLengthFromHost("baz.com.", true)); // none
- EXPECT_EQ(std::string::npos, GetRegistryLengthFromHost(L"", false));
- EXPECT_EQ(0U, GetRegistryLengthFromHost(L"foo.com..", false));
- EXPECT_EQ(0U, GetRegistryLengthFromHost(L"..", false));
- EXPECT_EQ(0U, GetRegistryLengthFromHost(L"192.168.0.1", false));
- EXPECT_EQ(0U, GetRegistryLengthFromHost(L"localhost", false));
- EXPECT_EQ(0U, GetRegistryLengthFromHost(L"localhost", true));
- EXPECT_EQ(0U, GetRegistryLengthFromHost(L"localhost.", false));
- EXPECT_EQ(0U, GetRegistryLengthFromHost(L"localhost.", true));
+ EXPECT_EQ(std::string::npos, GetRegistryLengthFromHost("", false));
+ EXPECT_EQ(0U, GetRegistryLengthFromHost("foo.com..", false));
+ EXPECT_EQ(0U, GetRegistryLengthFromHost("..", false));
+ EXPECT_EQ(0U, GetRegistryLengthFromHost("192.168.0.1", false));
+ EXPECT_EQ(0U, GetRegistryLengthFromHost("localhost", false));
+ EXPECT_EQ(0U, GetRegistryLengthFromHost("localhost", true));
+ EXPECT_EQ(0U, GetRegistryLengthFromHost("localhost.", false));
+ EXPECT_EQ(0U, GetRegistryLengthFromHost("localhost.", true));
}
TEST_F(RegistryControlledDomainTest, TestSameDomainOrHost) {
« net/base/net_util.cc ('K') | « net/base/registry_controlled_domain.cc ('k') | net/base/sdch_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698