WebSocketFrameChunk should use IOBuffer to hold data

net/websockets/websocket_frame_parser_unittest.cc

Index: net/websockets/websocket_frame_parser_unittest.cc
diff --git a/net/websockets/websocket_frame_parser_unittest.cc b/net/websockets/websocket_frame_parser_unittest.cc
index 9ddffbd2fbd94ac02751710dc51676e78c85d2b8..5a0d85e9d7b56d84b1a784905c430a0326a6c027 100644
--- a/net/websockets/websocket_frame_parser_unittest.cc
+++ b/net/websockets/websocket_frame_parser_unittest.cc
@@ -4,11 +4,13 @@
 
 #include "net/websockets/websocket_frame_parser.h"
 
+#include <algorithm>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_vector.h"
 #include "base/port.h"
+#include "net/base/io_buffer.h"
 #include "net/websockets/websocket_frame.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -67,7 +69,8 @@ TEST(WebSocketFrameParserTest, DecodeNormalFrame) {
   EXPECT_TRUE(frame->final_chunk);
 
   std::vector<char> expected_data(kHello, kHello + kHelloLength);

[Yuta Kitamura, 2012/07/27 08:01:08]

expected_data isn't used.

[Takashi Toyoshima, 2012/07/27 10:28:43]

Oops.
Thank you for catching this.

-  EXPECT_EQ(expected_data, frame->data);
+  EXPECT_EQ(kHelloLength, frame->size);
+  EXPECT_TRUE(std::equal(kHello, kHello + kHelloLength, frame->data->data()));
 }
 
 TEST(WebSocketFrameParserTest, DecodeMaskedFrame) {
@@ -93,8 +96,8 @@ TEST(WebSocketFrameParserTest, DecodeMaskedFrame) {
   }
   EXPECT_TRUE(frame->final_chunk);
 
-  std::vector<char> expected_data(kHello, kHello + kHelloLength);
-  EXPECT_EQ(expected_data, frame->data);
+  EXPECT_EQ(kHelloLength, frame->size);
+  EXPECT_TRUE(std::equal(kHello, kHello + kHelloLength, frame->data->data()));
 }
 
 TEST(WebSocketFrameParserTest, DecodeManyFrames) {
@@ -143,10 +146,11 @@ TEST(WebSocketFrameParserTest, DecodeManyFrames) {
     if (!frame)
       continue;
     EXPECT_TRUE(frame->final_chunk);
-    std::vector<char> expected_data(
+    EXPECT_EQ(kInputs[i].expected_payload_length, frame->size);
+    EXPECT_TRUE(std::equal(
         kInputs[i].expected_payload,
-        kInputs[i].expected_payload + kInputs[i].expected_payload_length);
-    EXPECT_EQ(expected_data, frame->data);
+        kInputs[i].expected_payload + kInputs[i].expected_payload_length,
+        frame->data->data()));
 
     const WebSocketFrameHeader* header = frame->header.get();
     EXPECT_TRUE(header != NULL);
@@ -187,7 +191,10 @@ TEST(WebSocketFrameParserTest, DecodePartialFrame) {
     if (!frame1)
       continue;
     EXPECT_FALSE(frame1->final_chunk);
-    EXPECT_EQ(expected1, frame1->data);
+    EXPECT_EQ(cutting_pos, frame1->size);
+    EXPECT_TRUE(std::equal(expected1.data(),
+                           expected1.data() + expected1.size(),
+                           frame1->data->data()));
     const WebSocketFrameHeader* header1 = frame1->header.get();
     EXPECT_TRUE(header1 != NULL);
     if (!header1)
@@ -211,7 +218,10 @@ TEST(WebSocketFrameParserTest, DecodePartialFrame) {
     if (!frame2)
       continue;
     EXPECT_TRUE(frame2->final_chunk);
-    EXPECT_EQ(expected2, frame2->data);
+    EXPECT_EQ(expected2.size(), frame2->size);
+    EXPECT_TRUE(std::equal(expected2.data(),
+                           expected2.data() + expected2.size(),
+                           frame2->data->data()));
     const WebSocketFrameHeader* header2 = frame2->header.get();
     EXPECT_TRUE(header2 == NULL);
   }
@@ -243,7 +253,10 @@ TEST(WebSocketFrameParserTest, DecodePartialMaskedFrame) {
     if (!frame1)
       continue;
     EXPECT_FALSE(frame1->final_chunk);
-    EXPECT_EQ(expected1, frame1->data);
+    EXPECT_EQ(expected1.size(), frame1->size);
+    EXPECT_TRUE(std::equal(expected1.data(),
+                           expected1.data() + expected1.size(),
+                           frame1->data->data()));
     const WebSocketFrameHeader* header1 = frame1->header.get();
     EXPECT_TRUE(header1 != NULL);
     if (!header1)
@@ -267,7 +280,10 @@ TEST(WebSocketFrameParserTest, DecodePartialMaskedFrame) {
     if (!frame2)
       continue;
     EXPECT_TRUE(frame2->final_chunk);
-    EXPECT_EQ(expected2, frame2->data);
+    EXPECT_EQ(expected2.size(), frame2->size);
+    EXPECT_TRUE(std::equal(expected2.data(),
+                           expected2.data() + expected2.size(),
+                           frame2->data->data()));
     const WebSocketFrameHeader* header2 = frame2->header.get();
     EXPECT_TRUE(header2 == NULL);
   }
@@ -302,7 +318,11 @@ TEST(WebSocketFrameParserTest, DecodeFramesOfVariousLengths) {
     else
       EXPECT_FALSE(frame->final_chunk);
     std::vector<char> expected_payload(input_payload_size, 'a');
-    EXPECT_EQ(expected_payload, frame->data);
+    EXPECT_EQ(expected_payload.size(), frame->size);
+    EXPECT_TRUE(std::equal(
+        expected_payload.data(),
+        expected_payload.data() + expected_payload.size(),
+        frame->data->data()));
     const WebSocketFrameHeader* header = frame->header.get();
     EXPECT_TRUE(header != NULL);
     if (!header)
@@ -346,7 +366,7 @@ TEST(WebSocketFrameParserTest, DecodePartialHeader) {
       EXPECT_TRUE(frame->final_chunk);
     else
       EXPECT_FALSE(frame->final_chunk);
-    EXPECT_EQ(std::vector<char>(), frame->data);
+    EXPECT_EQ(0u, frame->size);
     const WebSocketFrameHeader* header = frame->header.get();
     EXPECT_TRUE(header != NULL);
     if (!header)
@@ -444,7 +464,7 @@ TEST(WebSocketFrameParserTest, FrameTypes) {
     if (!frame)
       continue;
     EXPECT_TRUE(frame->final_chunk);
-    EXPECT_EQ(std::vector<char>(), frame->data);
+    EXPECT_EQ(0u, frame->size);
     const WebSocketFrameHeader* header = frame->header.get();
     EXPECT_TRUE(header != NULL);
     if (!header)
@@ -500,7 +520,7 @@ TEST(WebSocketFrameParserTest, FinalBitAndReservedBits) {
     if (!frame)
       continue;
     EXPECT_TRUE(frame->final_chunk);
-    EXPECT_EQ(std::vector<char>(), frame->data);
+    EXPECT_EQ(0u, frame->size);
     const WebSocketFrameHeader* header = frame->header.get();
     EXPECT_TRUE(header != NULL);
     if (!header)