diff options
| author | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-09 06:41:12 +0000 |
|---|---|---|
| committer | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-09 06:41:12 +0000 |
| commit | 69d7f89d6a93e0fbce451960287066195c6d4ea0 (patch) | |
| tree | 51c8c1f971d39d652ec38ed76070539bb33e85c7 /base/process_util_unittest.cc | |
| parent | e3748a79b523a8d365d4a33ef986eebb4186fa78 (diff) | |
| download | chromium_src-69d7f89d6a93e0fbce451960287066195c6d4ea0.zip chromium_src-69d7f89d6a93e0fbce451960287066195c6d4ea0.tar.gz chromium_src-69d7f89d6a93e0fbce451960287066195c6d4ea0.tar.bz2 | |
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
Diffstat (limited to 'base/process_util_unittest.cc')
| -rw-r--r-- | base/process_util_unittest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/base/process_util_unittest.cc b/base/process_util_unittest.cc index 3ce9942..265a2df 100644 --- a/base/process_util_unittest.cc +++ b/base/process_util_unittest.cc @@ -758,8 +758,8 @@ TEST_F(ProcessUtilTest, LaunchProcess) { EXPECT_EQ(0, setenv("BASE_TEST", "testing", 1 /* override */)); EXPECT_EQ("testing\n", TestLaunchProcess(env_changes, no_clone_flags)); - env_changes.push_back( - std::make_pair(std::string("BASE_TEST"), std::string())); + env_changes.push_back(std::make_pair(std::string("BASE_TEST"), + std::string(""))); EXPECT_EQ("\n", TestLaunchProcess(env_changes, no_clone_flags)); env_changes[0].second = "foo"; @@ -800,7 +800,7 @@ TEST_F(ProcessUtilTest, AlterEnvironment) { delete[] e; changes.clear(); - changes.push_back(std::make_pair(std::string("A"), std::string())); + changes.push_back(std::make_pair(std::string("A"), std::string(""))); e = base::AlterEnvironment(changes, empty); EXPECT_TRUE(e[0] == NULL); delete[] e; @@ -819,7 +819,7 @@ TEST_F(ProcessUtilTest, AlterEnvironment) { delete[] e; changes.clear(); - changes.push_back(std::make_pair(std::string("A"), std::string())); + changes.push_back(std::make_pair(std::string("A"), std::string(""))); e = base::AlterEnvironment(changes, a2); EXPECT_TRUE(e[0] == NULL); delete[] e; |