summaryrefslogtreecommitdiffstats
path: root/third_party/zlib
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-28 15:23:55 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-28 15:23:55 +0000
commit38d18040675fca09eb6ce054e5cfa98814a80978 (patch)
treea5900d9105f35ebf22c100da673a405b499f593c /third_party/zlib
parent0a8ebe1fbc0b30a72033a39c5f2dbd8afb8376c0 (diff)
downloadchromium_src-38d18040675fca09eb6ce054e5cfa98814a80978.zip
chromium_src-38d18040675fca09eb6ce054e5cfa98814a80978.tar.gz
chromium_src-38d18040675fca09eb6ce054e5cfa98814a80978.tar.bz2
Use a direct include of time headers in third_party/.
BUG=254986 TEST=none TBR=ben@chromium.org Review URL: https://codereview.chromium.org/18158003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209155 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/zlib')
-rw-r--r--third_party/zlib/google/zip_reader.h2
-rw-r--r--third_party/zlib/google/zip_reader_unittest.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/third_party/zlib/google/zip_reader.h b/third_party/zlib/google/zip_reader.h
index 4064da4..a1f4704 100644
--- a/third_party/zlib/google/zip_reader.h
+++ b/third_party/zlib/google/zip_reader.h
@@ -12,7 +12,7 @@
#include "base/files/file_path.h"
#include "base/memory/scoped_ptr.h"
#include "base/platform_file.h"
-#include "base/time.h"
+#include "base/time/time.h"
#if defined(USE_SYSTEM_MINIZIP)
#include <minizip/unzip.h>
diff --git a/third_party/zlib/google/zip_reader_unittest.cc b/third_party/zlib/google/zip_reader_unittest.cc
index a47ac53..ca5ceb8 100644
--- a/third_party/zlib/google/zip_reader_unittest.cc
+++ b/third_party/zlib/google/zip_reader_unittest.cc
@@ -14,7 +14,7 @@
#include "base/path_service.h"
#include "base/platform_file.h"
#include "base/strings/utf_string_conversions.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/platform_test.h"
#include "third_party/zlib/google/zip_internal.h"