Index: base/pickle_unittest.cc |
diff --git a/base/pickle_unittest.cc b/base/pickle_unittest.cc |
index b195a81e5e9ca36d4dc12f17a4e13f58f9815bc6..a152065bb573ac877074935ff3035d3e18c347f7 100644 |
--- a/base/pickle_unittest.cc |
+++ b/base/pickle_unittest.cc |
@@ -119,8 +119,7 @@ TEST(PickleTest, EncodeDecode) { |
EXPECT_TRUE(pickle.WriteBool(testbool1)); |
EXPECT_TRUE(pickle.WriteBool(testbool2)); |
EXPECT_TRUE(pickle.WriteInt(testint)); |
- EXPECT_TRUE( |
- pickle.WriteLongUsingDangerousNonPortableLessPersistableForm(testlong)); |
+ EXPECT_TRUE(pickle.WriteLong(testlong)); |
EXPECT_TRUE(pickle.WriteUInt16(testuint16)); |
EXPECT_TRUE(pickle.WriteUInt32(testuint32)); |
EXPECT_TRUE(pickle.WriteInt64(testint64)); |
@@ -160,7 +159,9 @@ TEST(PickleTest, SizeTFrom64Bit) { |
if (sizeof(size_t) < sizeof(uint64_t)) { |
// ReadSizeT() should return false when the original written value can't be |
// represented as a size_t. |
- EXPECT_FALSE(iter.ReadSizeT(&outsizet)); |
+#if GTEST_HAS_DEATH_TEST |
+ EXPECT_DEATH(ignore_result(iter.ReadSizeT(&outsizet)), ""); |
+#endif |
} else { |
EXPECT_TRUE(iter.ReadSizeT(&outsizet)); |
EXPECT_EQ(testuint64, outsizet); |