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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/base/net_util_unittest.cc

Issue 13145003: Rewrite std::string("") to std::string(), Linux edition. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Ugh Created 7 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
« no previous file with comments | « net/base/net_util.cc ('k') | net/base/registry_controlled_domains/registry_controlled_domain_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/net_util_unittest.cc
diff --git a/net/base/net_util_unittest.cc b/net/base/net_util_unittest.cc
index 8512d09c55e4ff92598f3898addf539d5ab03cf3..ab8a236358f0416ca729be16062e6177a363cecd 100644
--- a/net/base/net_util_unittest.cc
+++ b/net/base/net_util_unittest.cc
@@ -2596,10 +2596,14 @@ TEST(NetUtilTest, FormatUrlParsed) {
formatted.substr(parsed.ref.begin, parsed.ref.len));
// View-source case.
- formatted = FormatUrl(
- GURL("view-source:http://user:passwd@host:81/path?query#ref"),
- "", kFormatUrlOmitUsernamePassword, UnescapeRule::NORMAL, &parsed,
- NULL, NULL);
+ formatted =
+ FormatUrl(GURL("view-source:http://user:passwd@host:81/path?query#ref"),
+ std::string(),
+ kFormatUrlOmitUsernamePassword,
+ UnescapeRule::NORMAL,
+ &parsed,
+ NULL,
+ NULL);
EXPECT_EQ(WideToUTF16(L"view-source:http://host:81/path?query#ref"),
formatted);
EXPECT_EQ(WideToUTF16(L"view-source:http"),
@@ -2618,9 +2622,13 @@ TEST(NetUtilTest, FormatUrlParsed) {
formatted.substr(parsed.ref.begin, parsed.ref.len));
// omit http case.
- formatted = FormatUrl(
- GURL("http://host:8000/a?b=c#d"),
- "", kFormatUrlOmitHTTP, UnescapeRule::NORMAL, &parsed, NULL, NULL);
+ formatted = FormatUrl(GURL("http://host:8000/a?b=c#d"),
+ std::string(),
+ kFormatUrlOmitHTTP,
+ UnescapeRule::NORMAL,
+ &parsed,
+ NULL,
+ NULL);
EXPECT_EQ(WideToUTF16(L"host:8000/a?b=c#d"), formatted);
EXPECT_FALSE(parsed.scheme.is_valid());
EXPECT_FALSE(parsed.username.is_valid());
@@ -2637,9 +2645,13 @@ TEST(NetUtilTest, FormatUrlParsed) {
formatted.substr(parsed.ref.begin, parsed.ref.len));
// omit http starts with ftp case.
- formatted = FormatUrl(
- GURL("http://ftp.host:8000/a?b=c#d"),
- "", kFormatUrlOmitHTTP, UnescapeRule::NORMAL, &parsed, NULL, NULL);
+ formatted = FormatUrl(GURL("http://ftp.host:8000/a?b=c#d"),
+ std::string(),
+ kFormatUrlOmitHTTP,
+ UnescapeRule::NORMAL,
+ &parsed,
+ NULL,
+ NULL);
EXPECT_EQ(WideToUTF16(L"http://ftp.host:8000/a?b=c#d"), formatted);
EXPECT_TRUE(parsed.scheme.is_valid());
EXPECT_FALSE(parsed.username.is_valid());
@@ -2658,9 +2670,13 @@ TEST(NetUtilTest, FormatUrlParsed) {
formatted.substr(parsed.ref.begin, parsed.ref.len));
// omit http starts with 'f' case.
- formatted = FormatUrl(
- GURL("http://f/"),
- "", kFormatUrlOmitHTTP, UnescapeRule::NORMAL, &parsed, NULL, NULL);
+ formatted = FormatUrl(GURL("http://f/"),
+ std::string(),
+ kFormatUrlOmitHTTP,
+ UnescapeRule::NORMAL,
+ &parsed,
+ NULL,
+ NULL);
EXPECT_EQ(WideToUTF16(L"f/"), formatted);
EXPECT_FALSE(parsed.scheme.is_valid());
EXPECT_FALSE(parsed.username.is_valid());
@@ -2682,9 +2698,13 @@ TEST(NetUtilTest, FormatUrlRoundTripPathASCII) {
GURL url(std::string("http://www.google.com/") +
static_cast<char>(test_char));
size_t prefix_len;
- base::string16 formatted = FormatUrl(
- url, "", kFormatUrlOmitUsernamePassword, UnescapeRule::NORMAL, NULL,
- &prefix_len, NULL);
+ base::string16 formatted = FormatUrl(url,
+ std::string(),
+ kFormatUrlOmitUsernamePassword,
+ UnescapeRule::NORMAL,
+ NULL,
+ &prefix_len,
+ NULL);
EXPECT_EQ(url.spec(), GURL(formatted).spec());
}
}
@@ -2699,9 +2719,13 @@ TEST(NetUtilTest, FormatUrlRoundTripPathEscaped) {
GURL url(original_url);
size_t prefix_len;
- base::string16 formatted = FormatUrl(
- url, "", kFormatUrlOmitUsernamePassword, UnescapeRule::NORMAL, NULL,
- &prefix_len, NULL);
+ base::string16 formatted = FormatUrl(url,
+ std::string(),
+ kFormatUrlOmitUsernamePassword,
+ UnescapeRule::NORMAL,
+ NULL,
+ &prefix_len,
+ NULL);
EXPECT_EQ(url.spec(), GURL(formatted).spec());
}
}
@@ -2713,9 +2737,13 @@ TEST(NetUtilTest, FormatUrlRoundTripQueryASCII) {
GURL url(std::string("http://www.google.com/?") +
static_cast<char>(test_char));
size_t prefix_len;
- base::string16 formatted = FormatUrl(
- url, "", kFormatUrlOmitUsernamePassword, UnescapeRule::NORMAL, NULL,
- &prefix_len, NULL);
+ base::string16 formatted = FormatUrl(url,
+ std::string(),
+ kFormatUrlOmitUsernamePassword,
+ UnescapeRule::NORMAL,
+ NULL,
+ &prefix_len,
+ NULL);
EXPECT_EQ(url.spec(), GURL(formatted).spec());
}
}
@@ -2734,9 +2762,13 @@ TEST(NetUtilTest, FormatUrlRoundTripQueryEscaped) {
GURL url(original_url);
size_t prefix_len;
- base::string16 formatted = FormatUrl(
- url, "", kFormatUrlOmitUsernamePassword, UnescapeRule::NORMAL, NULL,
- &prefix_len, NULL);
+ base::string16 formatted = FormatUrl(url,
+ std::string(),
+ kFormatUrlOmitUsernamePassword,
+ UnescapeRule::NORMAL,
+ NULL,
+ &prefix_len,
+ NULL);
if (test_char &&
strchr(kUnescapedCharacters, static_cast<char>(test_char))) {
@@ -3036,7 +3068,7 @@ TEST(NetUtilTest, ParseIPLiteralToNumber_FailParse) {
EXPECT_FALSE(ParseIPLiteralToNumber("bad value", &number));
EXPECT_FALSE(ParseIPLiteralToNumber("bad:value", &number));
- EXPECT_FALSE(ParseIPLiteralToNumber("", &number));
+ EXPECT_FALSE(ParseIPLiteralToNumber(std::string(), &number));
EXPECT_FALSE(ParseIPLiteralToNumber("192.168.0.1:30", &number));
EXPECT_FALSE(ParseIPLiteralToNumber(" 192.168.0.1 ", &number));
EXPECT_FALSE(ParseIPLiteralToNumber("[::1]", &number));
« no previous file with comments | « net/base/net_util.cc ('k') | net/base/registry_controlled_domains/registry_controlled_domain_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698