diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-18 22:42:25 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-18 22:42:25 +0000 |
| commit | 056a8485be5325304fc2c28ab0cecca98e19d687 (patch) | |
| tree | 7cf3bb053f2f4fbd285b26d4c8dc578d0939a0f0 /net/base | |
| parent | a849323e1e44905e48c646b29872995209a9e08a (diff) | |
| download | chromium_src-056a8485be5325304fc2c28ab0cecca98e19d687.zip chromium_src-056a8485be5325304fc2c28ab0cecca98e19d687.tar.gz chromium_src-056a8485be5325304fc2c28ab0cecca98e19d687.tar.bz2 | |
Use generated shim headers for zlib.
BUG=165264
Review URL: https://codereview.chromium.org/11632002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173801 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base')
| -rw-r--r-- | net/base/crl_set.cc | 5 | ||||
| -rw-r--r-- | net/base/gzip_filter.cc | 7 | ||||
| -rw-r--r-- | net/base/gzip_filter_unittest.cc | 7 | ||||
| -rw-r--r-- | net/base/gzip_header.cc | 7 | ||||
| -rw-r--r-- | net/base/sdch_filter_unittest.cc | 7 |
5 files changed, 4 insertions, 29 deletions
diff --git a/net/base/crl_set.cc b/net/base/crl_set.cc index a6a1830..dd73c7e 100644 --- a/net/base/crl_set.cc +++ b/net/base/crl_set.cc @@ -13,12 +13,7 @@ #include "base/values.h" #include "crypto/sha2.h" #include "net/base/crl_set.h" - -#if defined(USE_SYSTEM_ZLIB) -#include <zlib.h> -#else #include "third_party/zlib/zlib.h" -#endif namespace net { diff --git a/net/base/gzip_filter.cc b/net/base/gzip_filter.cc index d4d72c3..2d02bce 100644 --- a/net/base/gzip_filter.cc +++ b/net/base/gzip_filter.cc @@ -4,14 +4,9 @@ #include "net/base/gzip_filter.h" -#if defined(USE_SYSTEM_ZLIB) -#include <zlib.h> -#else -#include "third_party/zlib/zlib.h" -#endif - #include "base/logging.h" #include "net/base/gzip_header.h" +#include "third_party/zlib/zlib.h" namespace net { diff --git a/net/base/gzip_filter_unittest.cc b/net/base/gzip_filter_unittest.cc index 8b76e8c..c889143 100644 --- a/net/base/gzip_filter_unittest.cc +++ b/net/base/gzip_filter_unittest.cc @@ -5,12 +5,6 @@ #include <fstream> #include <ostream> -#if defined(USE_SYSTEM_ZLIB) -#include <zlib.h> -#else -#include "third_party/zlib/zlib.h" -#endif - #include "base/file_util.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" @@ -19,6 +13,7 @@ #include "net/base/io_buffer.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" +#include "third_party/zlib/zlib.h" namespace { diff --git a/net/base/gzip_header.cc b/net/base/gzip_header.cc index 23a3dd3..81cb1d8 100644 --- a/net/base/gzip_header.cc +++ b/net/base/gzip_header.cc @@ -4,13 +4,8 @@ #include "net/base/gzip_header.h" -#if defined(USE_SYSTEM_ZLIB) -#include <zlib.h> -#else -#include "third_party/zlib/zlib.h" // for Z_DEFAULT_COMPRESSION -#endif - #include "base/logging.h" +#include "third_party/zlib/zlib.h" namespace net { diff --git a/net/base/sdch_filter_unittest.cc b/net/base/sdch_filter_unittest.cc index 1f28de5..ca68c08 100644 --- a/net/base/sdch_filter_unittest.cc +++ b/net/base/sdch_filter_unittest.cc @@ -8,12 +8,6 @@ #include <string> #include <vector> -#if defined(USE_SYSTEM_ZLIB) -#include <zlib.h> -#else -#include "third_party/zlib/zlib.h" -#endif - #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "net/base/filter.h" @@ -22,6 +16,7 @@ #include "net/base/sdch_filter.h" #include "net/url_request/url_request_http_job.h" #include "testing/gtest/include/gtest/gtest.h" +#include "third_party/zlib/zlib.h" namespace net { |