[rac] Use stale libaddressinput data if download fails

third_party/libaddressinput/chromium/cpp/test/validating_util_test.cc

Index: third_party/libaddressinput/chromium/cpp/test/validating_util_test.cc
diff --git a/third_party/libaddressinput/chromium/cpp/test/validating_util_test.cc b/third_party/libaddressinput/chromium/cpp/test/validating_util_test.cc
index a255741547da4c64bb688cc41d435580d47cda61..d68f661fe5c8fca70569b9d139625e24dc4d310f 100644
--- a/third_party/libaddressinput/chromium/cpp/test/validating_util_test.cc
+++ b/third_party/libaddressinput/chromium/cpp/test/validating_util_test.cc
@@ -103,38 +103,45 @@ TEST(ValidatingUtilTest, UnwrapChecksum) {
 
 TEST(ValidatingUtilTest, UnwrapTimestamp_CorruptedData) {
   std::string data(kCorruptedWrappedData);
-  EXPECT_FALSE(ValidatingUtil::UnwrapTimestamp(&data, kTimestamp));
+  EXPECT_EQ(ValidatingUtil::TIMESTAMP_INVALID,
+            ValidatingUtil::UnwrapTimestamp(&data, kTimestamp));
 }
 
 TEST(ValidatingUtilTest, UnwrapTimestamp_EmptyString) {
   std::string data;
-  EXPECT_FALSE(ValidatingUtil::UnwrapTimestamp(&data, kTimestamp));
+  EXPECT_EQ(ValidatingUtil::TIMESTAMP_INVALID,
+            ValidatingUtil::UnwrapTimestamp(&data, kTimestamp));
 }
 
 TEST(ValidatingUtilTest, UnwrapTimestamp_GarbageData) {
   std::string data("garbage");
-  EXPECT_FALSE(ValidatingUtil::UnwrapTimestamp(&data, kTimestamp));
+  EXPECT_EQ(ValidatingUtil::TIMESTAMP_INVALID,
+            ValidatingUtil::UnwrapTimestamp(&data, kTimestamp));
 }
 
 TEST(ValidatingUtilTest, UnwrapTimestamp_InMiddle) {
   std::string data(kTimestampInMiddle);
-  EXPECT_FALSE(ValidatingUtil::UnwrapTimestamp(&data, kTimestamp));
+  EXPECT_EQ(ValidatingUtil::TIMESTAMP_INVALID,
+            ValidatingUtil::UnwrapTimestamp(&data, kTimestamp));
 }
 
 TEST(ValidatingUtilTest, UnwrapTimestamp_Recent) {
   std::string data(kTimestampHalfMonthAgo);
-  EXPECT_TRUE(ValidatingUtil::UnwrapTimestamp(&data, kTimestamp));
+  EXPECT_EQ(ValidatingUtil::TIMESTAMP_VALID,
+            ValidatingUtil::UnwrapTimestamp(&data, kTimestamp));
   EXPECT_EQ(kUnwrappedData, data);
 }
 
 TEST(ValidatingUtilTest, UnwrapTimestamp_Stale) {
   std::string data(kTimestampTwoMonthsAgo);
-  EXPECT_FALSE(ValidatingUtil::UnwrapTimestamp(&data, kTimestamp));
+  EXPECT_EQ(ValidatingUtil::TIMESTAMP_STALE,
+            ValidatingUtil::UnwrapTimestamp(&data, kTimestamp));
 }
 
 TEST(ValidatingUtilTest, UnwrapTimestamp) {
   std::string data(kWrappedData);
-  EXPECT_TRUE(ValidatingUtil::UnwrapTimestamp(&data, kTimestamp));
+  EXPECT_EQ(ValidatingUtil::TIMESTAMP_VALID,
+            ValidatingUtil::UnwrapTimestamp(&data, kTimestamp));
   EXPECT_EQ(kChecksummedData, data);
 }
 
@@ -144,7 +151,8 @@ TEST(ValidatingUtilTest, Wrap) {
 
 TEST(ValidatingUtilTest, WrapUnwrapIt) {
   std::string data = ValidatingUtil::Wrap(kUnwrappedData, kTimestamp);
-  EXPECT_TRUE(ValidatingUtil::UnwrapTimestamp(&data, kTimestamp));
+  EXPECT_EQ(ValidatingUtil::TIMESTAMP_VALID,
+            ValidatingUtil::UnwrapTimestamp(&data, kTimestamp));
   EXPECT_EQ(kChecksummedData, data);
   EXPECT_TRUE(ValidatingUtil::UnwrapChecksum(&data));
   EXPECT_EQ(kUnwrappedData, data);