summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorjar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-30 18:23:13 +0000
committerjar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-30 18:23:13 +0000
commit8b6f3abcebeec2bc09c8186193060f711ad2365d (patch)
tree9575e751b9d375144dca05d3fa5b1cafe8af9ed6 /net
parente281138f9154364c8d74cb25b5a1447dda353f7d (diff)
downloadchromium_src-8b6f3abcebeec2bc09c8186193060f711ad2365d.zip
chromium_src-8b6f3abcebeec2bc09c8186193060f711ad2365d.tar.gz
chromium_src-8b6f3abcebeec2bc09c8186193060f711ad2365d.tar.bz2
Add cast to fix tree bustage on mac
tbr=huanr Review URL: http://codereview.chromium.org/57014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12786 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/base/sdch_filter_unittest.cc9
1 files changed, 6 insertions, 3 deletions
diff --git a/net/base/sdch_filter_unittest.cc b/net/base/sdch_filter_unittest.cc
index f79dc8e..a48b67f 100644
--- a/net/base/sdch_filter_unittest.cc
+++ b/net/base/sdch_filter_unittest.cc
@@ -199,8 +199,10 @@ TEST_F(SdchFilterTest, PassThroughWhenTentative) {
Filter::FilterStatus status = filter->ReadData(output_buffer,
&output_bytes_or_buffer_size);
- EXPECT_TRUE(non_sdch_content.size() == output_bytes_or_buffer_size);
- ASSERT_TRUE(sizeof(output_buffer) > output_bytes_or_buffer_size);
+ EXPECT_TRUE(non_sdch_content.size() ==
+ static_cast<size_t>(output_bytes_or_buffer_size));
+ ASSERT_TRUE(sizeof(output_buffer) >
+ static_cast<size_t>(output_bytes_or_buffer_size));
output_buffer[output_bytes_or_buffer_size] = '\0';
EXPECT_TRUE(non_sdch_content == output_buffer);
EXPECT_EQ(Filter::FILTER_NEED_MORE_DATA, status);
@@ -323,7 +325,8 @@ TEST_F(SdchFilterTest, ErrorOnBadReturnCodeWithHtml) {
&output_bytes_or_buffer_size);
// We should have read a long and complicated meta-refresh request.
- EXPECT_EQ(sizeof(output_buffer), output_bytes_or_buffer_size);
+ EXPECT_EQ(sizeof(output_buffer),
+ static_cast<size_t>(output_bytes_or_buffer_size));
// Check at least the prefix of the return.
EXPECT_EQ(0, strncmp(output_buffer,
"<head><META HTTP-EQUIV=\"Refresh\" CONTENT=\"0\"></head>",