Don't call the zlib functions with the MOZ_Z_ prefix...

net/base/gzip_filter_unittest.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <fstream>
 #include <iostream>
 
 #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
-// zlib.
-#define MOZ_Z_deflate deflate
-#define MOZ_Z_deflateEnd deflateEnd
 #include <zlib.h>
 #else
 #include "third_party/zlib/zlib.h"
 #endif
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/scoped_ptr.h"
 #include "net/base/gzip_filter.h"
 #include "net/base/mock_filter_context.h"
@@ skipping 120 matching lines @@
     // Write header if needed
     if (mode == ENCODE_GZIP) {
       if (zlib_stream.avail_out < sizeof(kGZipHeader))
         return Z_BUF_ERROR;
       memcpy(zlib_stream.next_out, kGZipHeader, sizeof(kGZipHeader));
       zlib_stream.next_out += sizeof(kGZipHeader);
       zlib_stream.avail_out -= sizeof(kGZipHeader);
     }
 
     // Do deflate
-    code = MOZ_Z_deflate(&zlib_stream, Z_FINISH);
+    code = deflate(&zlib_stream, Z_FINISH);
     *dest_len = *dest_len - zlib_stream.avail_out;
 
-    MOZ_Z_deflateEnd(&zlib_stream);
+    deflateEnd(&zlib_stream);
     return code;
   }
 
   // Use filter to decode compressed data, and compare the decoding result with
   // the orginal Data.
   // Parameters: Source and source_len are original data and its size.
   // Encoded_source and encoded_source_len are compressed data and its size.
   // Output_buffer_size specifies the size of buffer to read out data from
   // filter.
   void DecodeAndCompareWithFilter(Filter* filter,
@@ skipping 234 matching lines @@
   int corrupt_decode_size = kDefaultBufferSize;
 
   int code = DecodeAllWithFilter(filter.get(), corrupt_data, corrupt_data_len,
                                  corrupt_decode_buffer, &corrupt_decode_size);
 
   // Expect failures
   EXPECT_TRUE(code == Filter::FILTER_ERROR);
 }
 
 }  // namespace