Revert "Rewrite std::string("") to std::string(), Linux edition."

This reverts commit e59558b78e8c6a1b0bd916a724724b638c3c91b6.

Revert "Fix build after r193020."

This reverts commit 558a35897f6b3ffbcaefde927c1f150b815d140a.

Revert "Really fix build after r193020."

This reverts commit e3748a79b523a8d365d4a33ef986eebb4186fa78.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193030 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 12 insertions, 15 deletions

diff --git a/base/strings/string_split.cc b/base/strings/string_split.cc
index 819fdba..f5f19e9 100644
--- a/base/strings/string_split.cc
+++ b/base/strings/string_split.cc
@@ -107,8 +107,7 @@ bool SplitStringIntoKeyValuePairs(
       success = false;
     }
     DCHECK_LE(value.size(), 1U);
-    kv_pairs->push_back(
-        make_pair(key, value.empty() ? std::string() : value[0]));
+    kv_pairs->push_back(make_pair(key, value.empty()? "" : value[0]));
   }
   return success;
 }
diff --git a/base/strings/string_split_unittest.cc b/base/strings/string_split_unittest.cc
index 6729497..a950cac 100644
--- a/base/strings/string_split_unittest.cc
+++ b/base/strings/string_split_unittest.cc
@@ -36,10 +36,9 @@ class SplitStringIntoKeyValuesTest : public testing::Test {
 };
 
 TEST_F(SplitStringIntoKeyValuesTest, EmptyInputMultipleValues) {
-  EXPECT_FALSE(SplitStringIntoKeyValues(std::string(),  // Empty input
-                                        '\t',           // Key separators
-                                        &key,
-                                        &values));
+  EXPECT_FALSE(SplitStringIntoKeyValues("",     // Empty input
+                                        '\t',   // Key separators
+                                        &key, &values));
   EXPECT_TRUE(key.empty());
   EXPECT_TRUE(values.empty());
 }
@@ -70,10 +69,9 @@ TEST_F(SplitStringIntoKeyValuesTest, KeyWithMultipleValues) {
 }
 
 TEST_F(SplitStringIntoKeyValuesTest, EmptyInputSingleValue) {
-  EXPECT_FALSE(SplitStringIntoKeyValues(std::string(),  // Empty input
-                                        '\t',           // Key separators
-                                        &key,
-                                        &values));
+  EXPECT_FALSE(SplitStringIntoKeyValues("",     // Empty input
+                                        '\t',   // Key separators
+                                        &key, &values));
   EXPECT_TRUE(key.empty());
   EXPECT_TRUE(values.empty());
 }
@@ -110,9 +108,9 @@ class SplitStringIntoKeyValuePairsTest : public testing::Test {
 };
 
 TEST_F(SplitStringIntoKeyValuePairsTest, EmptyString) {
-  EXPECT_TRUE(SplitStringIntoKeyValuePairs(std::string(),
-                                           ':',  // Key-value delimiters
-                                           ',',  // Key-value pair delims
+  EXPECT_TRUE(SplitStringIntoKeyValuePairs("",
+                                           ':',   // Key-value delimiters
+                                           ',',   // Key-value pair delims
                                            &kv_pairs));
   EXPECT_TRUE(kv_pairs.empty());
 }
@@ -155,7 +153,7 @@ TEST_F(SplitStringIntoKeyValuePairsTest, DelimiterInValue) {
 
 TEST(SplitStringUsingSubstrTest, EmptyString) {
   std::vector<std::string> results;
-  SplitStringUsingSubstr(std::string(), "DELIMITER", &results);
+  SplitStringUsingSubstr("", "DELIMITER", &results);
   ASSERT_EQ(1u, results.size());
   EXPECT_THAT(results, ElementsAre(""));
 }
@@ -164,7 +162,7 @@ TEST(SplitStringUsingSubstrTest, EmptyString) {
 TEST(StringUtilTest, SplitString) {
   std::vector<std::wstring> r;
 
-  SplitString(std::wstring(), L',', &r);
+  SplitString(L"", L',', &r);
   EXPECT_EQ(0U, r.size());
   r.clear();