File chromium-codechanges-zlib.patch of Package chromium

diff -up chromium/src/net/base/gzip_header.cc chromium/src/net/base/gzip_header.cc
--- chromium/src/net/base/gzip_header.cc        2009-09-28 10:34:28.000000000 -0600
+++ chromium/src/net/base/gzip_header.cc    2009-11-24 17:23:22.000000000 -0700
@@ -4,11 +4,11 @@

 #include "net/base/gzip_header.h"

-#if defined(USE_SYSTEM_ZLIB)
+/* #if defined(USE_SYSTEM_ZLIB) */
 #include <zlib.h>
-#else
+/* #else
 #include "third_party/zlib/zlib.h"  // for Z_DEFAULT_COMPRESSION
-#endif
+#endif */

 #include "base/logging.h"

--- chromium/src/net/base/gzip_filter.cc      2009-09-28 18:34:27.000000000 +0200
+++ chromium/src/net/base/gzip_filter.cc      2009-10-22 15:51:57.713121495 +0200
@@ -4,7 +4,7 @@

 #include "net/base/gzip_filter.h"

-#if defined(USE_SYSTEM_ZLIB)
+/* #if defined(USE_SYSTEM_ZLIB) */
 #include <zlib.h>
 // The code below uses the MOZ_Z_ forms of these functions in order that things
 // should work on Windows. In order to make this code cross platform, we map
@@ -15,9 +15,9 @@
 #define MOZ_Z_inflateInit2_ inflateInit2_
 #define MOZ_Z_inflateInit_ inflateInit_
 #define MOZ_Z_inflateReset inflateReset
-#else
+/* #else
 #include "third_party/zlib/zlib.h"
-#endif
+#endif */

 #include "base/logging.h"
 #include "net/base/gzip_header.h"

diff -up chromium/src/net/base/gzip_filter_unittest.cc chromium/src/net/base/gzip_filter_unittest.cc
--- chromium/src/net/base/gzip_filter_unittest.cc       2009-09-28 10:34:27.000000000 -0600
+++ chromium/src/net/base/gzip_filter_unittest.cc.   2009-11-24 17:20:48.000000000 -0700
@@ -5,7 +5,7 @@
 #include <fstream>
 #include <iostream>

-#if defined(USE_SYSTEM_ZLIB)
+/* #if defined(USE_SYSTEM_ZLIB) */
 // The code below uses the MOZ_Z_ forms of these functions in order that things
 // should work on Windows. In order to make this code cross platform, we map
 // back to the normal functions here in the case that we are using the system
@@ -13,9 +13,9 @@
 #define MOZ_Z_deflate deflate
 #define MOZ_Z_deflateEnd deflateEnd
 #include <zlib.h>
-#else
+/* #else
 #include "third_party/zlib/zlib.h"
-#endif
+#endif */

 #include "base/file_util.h"
 #include "base/path_service.h"
diff -up chromium/src/net/base/sdch_filter_unittest.cc chromium/src/net/base/sdch_filter_unittest.cc
--- chromium/src/net/base/sdch_filter_unittest.cc       2009-09-28 10:34:29.000000000 -0600
+++ chromium/src/net/base/sdch_filter_unittest.cc   2009-11-24 17:21:57.000000000 -0700
@@ -8,11 +8,11 @@
 #include <string>
 #include <vector>

-#if defined(USE_SYSTEM_ZLIB)
+/* #if defined(USE_SYSTEM_ZLIB) */
 #include <zlib.h>
-#else
+/* #else
 #include "third_party/zlib/zlib.h"
-#endif
+#endif */

 #include "base/logging.h"
 #include "base/scoped_ptr.h"
--- chromium/src/chrome/common/metrics_helpers.cc       2009-09-28 10:34:29.000000000 -0600
+++ chromium/src/chrome/common/metrics_helpers.cc   2009-11-24 17:21:57.000000000 -0700
@@ -4,11 +4,7 @@
 
 #include "chrome/common/metrics_helpers.h"
 
-#if defined(USE_SYSTEM_LIBBZ2)
 #include <bzlib.h>
-#else
-#include "third_party/bzip2/bzlib.h"
-#endif
 
 #include "base/base64.h"
 #include "base/time.h"