diff options
| author | mbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-09 16:56:40 +0000 |
|---|---|---|
| committer | mbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-09 16:56:40 +0000 |
| commit | b172068c7dea600ebda1c7fdfd31dca03d10b119 (patch) | |
| tree | 99250f9a03bb5e55c04a4be64fe88a6deff22ae1 /net/flip/flip_framer_test.cc | |
| parent | 3f4a9c66370575e650a1c28353182cd3f9f77f14 (diff) | |
| download | chromium_src-b172068c7dea600ebda1c7fdfd31dca03d10b119.zip chromium_src-b172068c7dea600ebda1c7fdfd31dca03d10b119.tar.gz chromium_src-b172068c7dea600ebda1c7fdfd31dca03d10b119.tar.bz2 | |
A few more misc fixes for the linux port.
Temporarily turn off SSL until the SSL full duplex patch can land.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/272004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28550 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/flip/flip_framer_test.cc')
| -rw-r--r-- | net/flip/flip_framer_test.cc | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/net/flip/flip_framer_test.cc b/net/flip/flip_framer_test.cc index 473338d..847b83f 100644 --- a/net/flip/flip_framer_test.cc +++ b/net/flip/flip_framer_test.cc @@ -8,13 +8,7 @@ #include "flip_framer.h" // cross-google3 directory naming. #include "flip_protocol.h" #include "flip_frame_builder.h" -#ifdef _WIN32 #include "testing/platform_test.h" -#else -#include "testing/base/public/gunit.h" - -#define PlatformTest ::testing::Test -#endif namespace flip { @@ -90,12 +84,12 @@ class TestFlipVisitor : public FlipFramerVisitorInterface { // Test our protocol constants TEST_F(FlipFramerTest, ProtocolConstants) { - EXPECT_EQ(8, sizeof(FlipFrame)); - EXPECT_EQ(8, sizeof(FlipDataFrame)); - EXPECT_EQ(12, sizeof(FlipControlFrame)); - EXPECT_EQ(16, sizeof(FlipSynStreamControlFrame)); - EXPECT_EQ(16, sizeof(FlipSynReplyControlFrame)); - EXPECT_EQ(16, sizeof(FlipFinStreamControlFrame)); + EXPECT_EQ(8u, sizeof(FlipFrame)); + EXPECT_EQ(8u, sizeof(FlipDataFrame)); + EXPECT_EQ(12u, sizeof(FlipControlFrame)); + EXPECT_EQ(16u, sizeof(FlipSynStreamControlFrame)); + EXPECT_EQ(16u, sizeof(FlipSynReplyControlFrame)); + EXPECT_EQ(16u, sizeof(FlipFinStreamControlFrame)); EXPECT_EQ(1, SYN_STREAM); EXPECT_EQ(2, SYN_REPLY); EXPECT_EQ(3, FIN_STREAM); |