diff options
author | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-09 08:46:45 +0000 |
---|---|---|
committer | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-09 08:46:45 +0000 |
commit | 007b3f812fc9c989fb99d4a668d8bd9c7807ad81 (patch) | |
tree | 43e69dd0f4e4dbbe68afb6319fa18cee07a4be64 /net/base/net_util_unittest.cc | |
parent | 2bde7e94eb8f402839145e48924391a5c645a554 (diff) | |
download | chromium_src-007b3f812fc9c989fb99d4a668d8bd9c7807ad81.zip chromium_src-007b3f812fc9c989fb99d4a668d8bd9c7807ad81.tar.gz chromium_src-007b3f812fc9c989fb99d4a668d8bd9c7807ad81.tar.bz2 |
Rewrite std::string("") to std::string(), Linux edition.
This patch was generated by running the empty_string clang tool
across the Chromium Linux compilation database. Implicitly or
explicitly constructing std::string() with a "" argument is
inefficient as the caller needs to emit extra instructions to
pass an argument, and the constructor needlessly copies a byte
into internal storage. Rewriting these instances to simply call
the default constructor appears to save ~14-18 kilobytes on an
optimized release build.
BUG=none
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=193020
Review URL: https://codereview.chromium.org/13145003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193040 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/net_util_unittest.cc')
-rw-r--r-- | net/base/net_util_unittest.cc | 84 |
1 files changed, 58 insertions, 26 deletions
diff --git a/net/base/net_util_unittest.cc b/net/base/net_util_unittest.cc index 8512d09..ab8a236 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)); |