diff --git a/deps/zlib/google/OWNERS b/deps/zlib/google/OWNERS index 1bd83ac482ee..901c226205f8 100644 --- a/deps/zlib/google/OWNERS +++ b/deps/zlib/google/OWNERS @@ -1,4 +1,4 @@ -satorux@chromium.org +satorux@google.com # compression_utils* asvitkine@chromium.org diff --git a/deps/zlib/google/zip_reader_unittest.cc b/deps/zlib/google/zip_reader_unittest.cc index 578539ffbf76..6e58f7f72ee8 100644 --- a/deps/zlib/google/zip_reader_unittest.cc +++ b/deps/zlib/google/zip_reader_unittest.cc @@ -35,7 +35,6 @@ #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" -#include "third_party/icu/source/i18n/unicode/timezone.h" #include "third_party/zlib/google/zip_internal.h" using ::testing::_; @@ -367,10 +366,8 @@ TEST_F(ZipReaderTest, RegularFile) { EXPECT_EQ(target_path, entry->path); EXPECT_EQ(13527, entry->original_size); - EXPECT_EQ("2009-05-29 06:22:20.000", - base::UnlocalizedTimeFormatWithPattern(entry->last_modified, - "y-MM-dd HH:mm:ss.SSS", - icu::TimeZone::getGMT())); + EXPECT_EQ("2009-05-29T06:22:20.000Z", + base::TimeFormatAsIso8601(entry->last_modified)); EXPECT_FALSE(entry->is_unsafe); EXPECT_FALSE(entry->is_directory); } @@ -467,10 +464,8 @@ TEST_F(ZipReaderTest, Directory) { EXPECT_EQ(target_path, entry->path); // The directory size should be zero. EXPECT_EQ(0, entry->original_size); - EXPECT_EQ("2009-05-31 15:49:52.000", - base::UnlocalizedTimeFormatWithPattern(entry->last_modified, - "y-MM-dd HH:mm:ss.SSS", - icu::TimeZone::getGMT())); + EXPECT_EQ("2009-05-31T15:49:52.000Z", + base::TimeFormatAsIso8601(entry->last_modified)); EXPECT_FALSE(entry->is_unsafe); EXPECT_TRUE(entry->is_directory); } diff --git a/src/zlib_version.h b/src/zlib_version.h index 302282a2027e..861b339e2bfc 100644 --- a/src/zlib_version.h +++ b/src/zlib_version.h @@ -2,5 +2,5 @@ // Refer to tools/dep_updaters/update-zlib.sh #ifndef SRC_ZLIB_VERSION_H_ #define SRC_ZLIB_VERSION_H_ -#define ZLIB_VERSION "1.3.2.1-motley-42c2f19" +#define ZLIB_VERSION "1.3.2.1-motley-8002e91" #endif // SRC_ZLIB_VERSION_H_