| Index: content/child/shared_memory_received_data_factory_unittest.cc
|
| diff --git a/content/child/shared_memory_received_data_factory_unittest.cc b/content/child/shared_memory_received_data_factory_unittest.cc
|
| index ce0b890c8182e23d379e89d6565efe2478fceca7..9f42494b1430b90c02e4dbd26391a3c3b8fc37c6 100644
|
| --- a/content/child/shared_memory_received_data_factory_unittest.cc
|
| +++ b/content/child/shared_memory_received_data_factory_unittest.cc
|
| @@ -72,13 +72,14 @@ TEST_F(SharedMemoryReceivedDataFactoryTest, Create) {
|
| EXPECT_CALL(*sender_, SendAck(request_id_));
|
| EXPECT_CALL(checkpoint, Call(1));
|
|
|
| - std::unique_ptr<ReceivedData> data = factory_->Create(12, 34, 56);
|
| + std::unique_ptr<ReceivedData> data = factory_->Create(12, 34, 56, 30);
|
| const char* memory_start = static_cast<const char*>(memory_->memory());
|
|
|
| ASSERT_TRUE(data);
|
| EXPECT_EQ(memory_start + 12, data->payload());
|
| EXPECT_EQ(34, data->length());
|
| EXPECT_EQ(56, data->encoded_length());
|
| + EXPECT_EQ(30, data->encoded_body_length());
|
|
|
| checkpoint.Call(0);
|
| data.reset();
|
| @@ -96,9 +97,9 @@ TEST_F(SharedMemoryReceivedDataFactoryTest, CreateMultiple) {
|
| EXPECT_CALL(*sender_, SendAck(request_id_));
|
| EXPECT_CALL(checkpoint, Call(3));
|
|
|
| - std::unique_ptr<ReceivedData> data1 = factory_->Create(0, 1, 1);
|
| - std::unique_ptr<ReceivedData> data2 = factory_->Create(1, 1, 1);
|
| - std::unique_ptr<ReceivedData> data3 = factory_->Create(2, 1, 1);
|
| + std::unique_ptr<ReceivedData> data1 = factory_->Create(0, 1, 1, 1);
|
| + std::unique_ptr<ReceivedData> data2 = factory_->Create(1, 1, 1, 1);
|
| + std::unique_ptr<ReceivedData> data3 = factory_->Create(2, 1, 1, 1);
|
|
|
| EXPECT_TRUE(data1);
|
| EXPECT_TRUE(data2);
|
| @@ -124,9 +125,9 @@ TEST_F(SharedMemoryReceivedDataFactoryTest, ReclaimOutOfOrder) {
|
| EXPECT_CALL(*sender_, SendAck(request_id_));
|
| EXPECT_CALL(checkpoint, Call(3));
|
|
|
| - std::unique_ptr<ReceivedData> data1 = factory_->Create(0, 1, 1);
|
| - std::unique_ptr<ReceivedData> data2 = factory_->Create(1, 1, 1);
|
| - std::unique_ptr<ReceivedData> data3 = factory_->Create(2, 1, 1);
|
| + std::unique_ptr<ReceivedData> data1 = factory_->Create(0, 1, 1, 1);
|
| + std::unique_ptr<ReceivedData> data2 = factory_->Create(1, 1, 1, 1);
|
| + std::unique_ptr<ReceivedData> data3 = factory_->Create(2, 1, 1, 1);
|
|
|
| EXPECT_TRUE(data1);
|
| EXPECT_TRUE(data2);
|
| @@ -156,12 +157,12 @@ TEST_F(SharedMemoryReceivedDataFactoryTest, ReclaimOutOfOrderPartially) {
|
| EXPECT_CALL(*sender_, SendAck(request_id_));
|
| EXPECT_CALL(checkpoint, Call(4));
|
|
|
| - std::unique_ptr<ReceivedData> data1 = factory_->Create(0, 1, 1);
|
| - std::unique_ptr<ReceivedData> data2 = factory_->Create(1, 1, 1);
|
| - std::unique_ptr<ReceivedData> data3 = factory_->Create(2, 1, 1);
|
| - std::unique_ptr<ReceivedData> data4 = factory_->Create(3, 1, 1);
|
| - std::unique_ptr<ReceivedData> data5 = factory_->Create(4, 1, 1);
|
| - std::unique_ptr<ReceivedData> data6 = factory_->Create(5, 1, 1);
|
| + std::unique_ptr<ReceivedData> data1 = factory_->Create(0, 1, 1, 1);
|
| + std::unique_ptr<ReceivedData> data2 = factory_->Create(1, 1, 1, 1);
|
| + std::unique_ptr<ReceivedData> data3 = factory_->Create(2, 1, 1, 1);
|
| + std::unique_ptr<ReceivedData> data4 = factory_->Create(3, 1, 1, 1);
|
| + std::unique_ptr<ReceivedData> data5 = factory_->Create(4, 1, 1, 1);
|
| + std::unique_ptr<ReceivedData> data6 = factory_->Create(5, 1, 1, 1);
|
|
|
| EXPECT_TRUE(data1);
|
| EXPECT_TRUE(data2);
|
| @@ -194,12 +195,12 @@ TEST_F(SharedMemoryReceivedDataFactoryTest, Stop) {
|
| EXPECT_CALL(checkpoint, Call(2));
|
| EXPECT_CALL(checkpoint, Call(3));
|
|
|
| - std::unique_ptr<ReceivedData> data1 = factory_->Create(0, 1, 1);
|
| - std::unique_ptr<ReceivedData> data2 = factory_->Create(1, 1, 1);
|
| - std::unique_ptr<ReceivedData> data3 = factory_->Create(2, 1, 1);
|
| - std::unique_ptr<ReceivedData> data4 = factory_->Create(3, 1, 1);
|
| - std::unique_ptr<ReceivedData> data5 = factory_->Create(4, 1, 1);
|
| - std::unique_ptr<ReceivedData> data6 = factory_->Create(5, 1, 1);
|
| + std::unique_ptr<ReceivedData> data1 = factory_->Create(0, 1, 1, 1);
|
| + std::unique_ptr<ReceivedData> data2 = factory_->Create(1, 1, 1, 1);
|
| + std::unique_ptr<ReceivedData> data3 = factory_->Create(2, 1, 1, 1);
|
| + std::unique_ptr<ReceivedData> data4 = factory_->Create(3, 1, 1, 1);
|
| + std::unique_ptr<ReceivedData> data5 = factory_->Create(4, 1, 1, 1);
|
| + std::unique_ptr<ReceivedData> data6 = factory_->Create(5, 1, 1, 1);
|
|
|
| EXPECT_TRUE(data1);
|
| EXPECT_TRUE(data2);
|
|
|