diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-25 11:39:07 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-01-25 15:20:42 +0000 |
commit | 6c91641271e536ffaa88a1dff5127e42ee99a91e (patch) | |
tree | 703d9dd49602377ddc90cbf886aad37913f2496b /chromium/net/quic/quic_clock_test.cc | |
parent | b145b7fafd36f0c260d6a768c81fc14e32578099 (diff) | |
download | qtwebengine-chromium-6c91641271e536ffaa88a1dff5127e42ee99a91e.tar.gz |
BASELINE: Update Chromium to 49.0.2623.23
Also adds missing printing sources.
Change-Id: I3726b8f0c7d6751c9fc846096c571fadca7108cd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'chromium/net/quic/quic_clock_test.cc')
-rw-r--r-- | chromium/net/quic/quic_clock_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chromium/net/quic/quic_clock_test.cc b/chromium/net/quic/quic_clock_test.cc index 6ee4540889f..b6800611ebe 100644 --- a/chromium/net/quic/quic_clock_test.cc +++ b/chromium/net/quic/quic_clock_test.cc @@ -29,8 +29,8 @@ TEST(QuicClockTest, WallNow) { // If end > start, then we can check now is between start and end. if (end > start) { - EXPECT_LE(static_cast<uint64>(start.ToTimeT()), now.ToUNIXSeconds()); - EXPECT_LE(now.ToUNIXSeconds(), static_cast<uint64>(end.ToTimeT())); + EXPECT_LE(static_cast<uint64_t>(start.ToTimeT()), now.ToUNIXSeconds()); + EXPECT_LE(now.ToUNIXSeconds(), static_cast<uint64_t>(end.ToTimeT())); } } |