Enable sdch_filter_unittest to run on Linux

Enable sdch_filter_unittest to run on Linux by removing the 
"MOZ_Z_" prefixes from zlib calls.

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=75016

[adamk, 2011-02-14 22:33:30]

I couldn't figure out from Subversion's history why this wasn't being run on
Linux.  If there's a reason it still shouldn't be run (despite the fact that it
passes), let me know.

As for why I noticed this in the first place: I ran into it when running
http://codereview.chromium.org/6516025/ on the try bots.

[jar (doing other things), 2011-02-14 23:08:01]

LGTM

I assume it was dropped at some point in the porting process.  SDCH is used
cross platform, so this unit test should indeed be active.

Thanks!

[wtc, 2011-02-15 01:12:56]

adamk: there may be a better solution to this problem.
Give me a few minutes.

[wtc, 2011-02-15 01:39:59]

adamk, jar: 

I found that src\third_party\zlib is not the original zlib,
but the zlib modified by Mozilla.  I don't know why we need
Mozilla's changes to zlib.  When we update src\third_party\zlib
to the latest zlib 1.2.5 release, we should use the original
zlib.

Even Mozilla itself doesn't call the zlib functions with
the MOZ_Z_ prefix.  See:
http://mxr.mozilla.org/mozilla-central/search?string=MOZ_Z_deflate
http://mxr.mozilla.org/mozilla-central/search?string=MOZ_Z_deflateEnd

The following change works on Windows.
net/base/{gzip_filter.cc,gzip_filter_unittest.cc} and
remoting/base/{compressor_zlib.cc,decompressor_zlib.cc}
should be changed the same way.

Index: net/base/sdch_filter_unittest.cc
===================================================================
--- net/base/sdch_filter_unittest.cc    (revision 74874)
+++ net/base/sdch_filter_unittest.cc    (working copy)
@@ -827,10 +827,10 @@
   zlib_stream.avail_out -= sizeof(kGZipHeader);

   // Do deflate
-  code = MOZ_Z_deflate(&zlib_stream, Z_FINISH);
+  code = deflate(&zlib_stream, Z_FINISH);
   gzip_compressed_length -= zlib_stream.avail_out;
   std::string compressed(gzip_compressed.get(), gzip_compressed_length);
-  MOZ_Z_deflateEnd(&zlib_stream);
+  deflateEnd(&zlib_stream);
   return compressed;
 }

[adamk, 2011-02-15 18:45:03]

On 2011/02/15 01:39:59, wtc wrote:
> adamk, jar: 
> 
> I found that src\third_party\zlib is not the original zlib,
> but the zlib modified by Mozilla.  I don't know why we need
> Mozilla's changes to zlib.  When we update src\third_party\zlib
> to the latest zlib 1.2.5 release, we should use the original
> zlib.
> 
> Even Mozilla itself doesn't call the zlib functions with
> the MOZ_Z_ prefix.  See:
> http://mxr.mozilla.org/mozilla-central/search?string=MOZ_Z_deflate
> http://mxr.mozilla.org/mozilla-central/search?string=MOZ_Z_deflateEnd
> 
> The following change works on Windows.
> net/base/{gzip_filter.cc,gzip_filter_unittest.cc} and
> remoting/base/{compressor_zlib.cc,decompressor_zlib.cc}
> should be changed the same way.
> 
> Index: net/base/sdch_filter_unittest.cc
> ===================================================================
> --- net/base/sdch_filter_unittest.cc    (revision 74874)
> +++ net/base/sdch_filter_unittest.cc    (working copy)
> @@ -827,10 +827,10 @@
>    zlib_stream.avail_out -= sizeof(kGZipHeader);
> 
>    // Do deflate
> -  code = MOZ_Z_deflate(&zlib_stream, Z_FINISH);
> +  code = deflate(&zlib_stream, Z_FINISH);
>    gzip_compressed_length -= zlib_stream.avail_out;
>    std::string compressed(gzip_compressed.get(), gzip_compressed_length);
> -  MOZ_Z_deflateEnd(&zlib_stream);
> +  deflateEnd(&zlib_stream);
>    return compressed;
>  }

Indeed, this works fine.  The latest patch matches your suggestion.

[wtc, 2011-02-15 18:49:29]

LGTM.  Thanks!