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/pickle_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/pickle_unittest.cc')
| -rw-r--r-- | base/pickle_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/base/pickle_unittest.cc b/base/pickle_unittest.cc index d252dae..d418fdf 100644 --- a/base/pickle_unittest.cc +++ b/base/pickle_unittest.cc @@ -134,7 +134,7 @@ TEST(PickleTest, UnalignedSize) { TEST(PickleTest, ZeroLenStr) { Pickle pickle; - EXPECT_TRUE(pickle.WriteString(std::string())); + EXPECT_TRUE(pickle.WriteString("")); PickleIterator iter(pickle); std::string outstr; @@ -144,7 +144,7 @@ TEST(PickleTest, ZeroLenStr) { TEST(PickleTest, ZeroLenWStr) { Pickle pickle; - EXPECT_TRUE(pickle.WriteWString(std::wstring())); + EXPECT_TRUE(pickle.WriteWString(L"")); PickleIterator iter(pickle); std::string outstr; |