content/child/shared_memory_data_consumer_handle_unittest.cc - Issue 2172183003: Return unique_ptr<WebDataConsumerHandle::Reader> directly from obtainReader

Unified Diff: content/child/shared_memory_data_consumer_handle_unittest.cc

Issue 2172183003: Return unique_ptr<WebDataConsumerHandle::Reader> directly from obtainReader (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gmock_cxx11

Patch Set: rebase Created 4 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

View side-by-side diff with in-line comments

Index: content/child/shared_memory_data_consumer_handle_unittest.cc

diff --git a/content/child/shared_memory_data_consumer_handle_unittest.cc b/content/child/shared_memory_data_consumer_handle_unittest.cc

index 9456f6c440dcdba4489772a861e18a39a92b8579..fae896cf12acec41cdce3c5e1148d6ca0e092f90 100644

--- a/content/child/shared_memory_data_consumer_handle_unittest.cc

+++ b/content/child/shared_memory_data_consumer_handle_unittest.cc

@@ -146,7 +146,7 @@ class ThreadedSharedMemoryDataConsumerHandleTest : public ::testing::Test {

void ReadData() {

if (!client_) {

client_.reset(new ClientImpl(this));

- reader_ = handle_->ObtainReader(client_.get());

+ reader_ = handle_->obtainReader(client_.get());

}

Result rv = kOk;

@@ -222,7 +222,7 @@ void RunPostedTasks() {

TEST_P(SharedMemoryDataConsumerHandleTest, ReadFromEmpty) {

char buffer[4];

size_t read = 88;

- auto reader = handle_->ObtainReader(nullptr);

+ auto reader = handle_->obtainReader(nullptr);

Result result = reader->read(buffer, 4, kNone, &read);

EXPECT_EQ(kShouldWait, result);

@@ -234,7 +234,7 @@ TEST_P(SharedMemoryDataConsumerHandleTest, AutoClose) {

size_t read = 88;

writer_.reset();

- auto reader = handle_->ObtainReader(nullptr);

+ auto reader = handle_->obtainReader(nullptr);

Result result = reader->read(buffer, 4, kNone, &read);

EXPECT_EQ(kDone, result);

@@ -246,7 +246,7 @@ TEST_P(SharedMemoryDataConsumerHandleTest, ReadSimple) {

char buffer[4] = {};

size_t read = 88;

- auto reader = handle_->ObtainReader(nullptr);

+ auto reader = handle_->obtainReader(nullptr);

Result result = reader->read(buffer, 3, kNone, &read);

EXPECT_EQ(kOk, result);

@@ -274,7 +274,7 @@ TEST_P(SharedMemoryDataConsumerHandleTest, ReadAfterHandleIsGone) {

char buffer[8] = {};

size_t read = 88;

- auto reader = handle_->ObtainReader(nullptr);

+ auto reader = handle_->obtainReader(nullptr);

handle_.reset();

@@ -300,7 +300,7 @@ TEST_P(SharedMemoryDataConsumerHandleTest, ReObtainReader) {

char buffer[4] = {};

size_t read = 88;

- auto reader = handle_->ObtainReader(nullptr);

+ auto reader = handle_->obtainReader(nullptr);

Result result = reader->read(buffer, 3, kNone, &read);

EXPECT_EQ(kOk, result);

@@ -308,7 +308,7 @@ TEST_P(SharedMemoryDataConsumerHandleTest, ReObtainReader) {

EXPECT_STREQ("hel", buffer);

reader.reset();

- reader = handle_->ObtainReader(nullptr);

+ reader = handle_->obtainReader(nullptr);

result = reader->read(buffer, 3, kNone, &read);

EXPECT_EQ(kOk, result);

@@ -332,7 +332,7 @@ TEST_P(SharedMemoryDataConsumerHandleTest, CloseBeforeReading) {

char buffer[20] = {};

size_t read = 88;

- auto reader = handle_->ObtainReader(nullptr);

+ auto reader = handle_->obtainReader(nullptr);

Result result = reader->read(buffer, sizeof(buffer), kNone, &read);

EXPECT_EQ(kOk, result);

@@ -349,7 +349,7 @@ TEST_P(SharedMemoryDataConsumerHandleTest, CloseWithDataBeforeZeroRead) {

writer_->Close();

size_t read = 88;

- auto reader = handle_->ObtainReader(nullptr);

+ auto reader = handle_->obtainReader(nullptr);

Result result = reader->read(nullptr, 0, kNone, &read);

EXPECT_EQ(kOk, result);

@@ -360,7 +360,7 @@ TEST_P(SharedMemoryDataConsumerHandleTest, CloseWithoutDataBeforeZeroRead) {

writer_->Close();

size_t read = 88;

- auto reader = handle_->ObtainReader(nullptr);

+ auto reader = handle_->obtainReader(nullptr);

Result result = reader->read(nullptr, 0, kNone, &read);

EXPECT_EQ(kDone, result);

@@ -380,7 +380,7 @@ TEST_P(SharedMemoryDataConsumerHandleTest, AddMultipleData) {

size_t read;

Result result;

- auto reader = handle_->ObtainReader(nullptr);

+ auto reader = handle_->obtainReader(nullptr);

std::fill(&buffer[0], &buffer[arraysize(buffer)], 0);

result = reader->read(buffer, 6, kNone, &read);

EXPECT_EQ(kOk, result);

@@ -424,7 +424,7 @@ TEST_P(SharedMemoryDataConsumerHandleTest, AddMultipleDataInteractively) {

size_t read;

Result result;

- auto reader = handle_->ObtainReader(nullptr);

+ auto reader = handle_->obtainReader(nullptr);

std::fill(&buffer[0], &buffer[arraysize(buffer)], 0);

result = reader->read(buffer, 6, kNone, &read);

EXPECT_EQ(kOk, result);

@@ -486,7 +486,7 @@ TEST_P(SharedMemoryDataConsumerHandleTest, RegisterClient) {

EXPECT_CALL(checkpoint, Call(4));

checkpoint.Call(0);

- auto reader = handle_->ObtainReader(&client_);

+ auto reader = handle_->obtainReader(&client_);

checkpoint.Call(1);

RunPostedTasks();

checkpoint.Call(2);

@@ -509,7 +509,7 @@ TEST_P(SharedMemoryDataConsumerHandleTest, RegisterClientWhenDataExists) {

checkpoint.Call(0);

writer_->AddData(NewFixedData("Once "));

checkpoint.Call(1);

- auto reader = handle_->ObtainReader(&client_);

+ auto reader = handle_->obtainReader(&client_);

checkpoint.Call(2);

RunPostedTasks();

checkpoint.Call(3);

@@ -532,7 +532,7 @@ TEST_P(SharedMemoryDataConsumerHandleTest, AddDataWhenClientIsRegistered) {

EXPECT_CALL(checkpoint, Call(5));

checkpoint.Call(0);

- auto reader = handle_->ObtainReader(&client_);

+ auto reader = handle_->obtainReader(&client_);

checkpoint.Call(1);

writer_->AddData(NewFixedData("Once "));

checkpoint.Call(2);

@@ -557,7 +557,7 @@ TEST_P(SharedMemoryDataConsumerHandleTest, CloseWithClientAndData) {

EXPECT_CALL(checkpoint, Call(3));

checkpoint.Call(0);

- auto reader = handle_->ObtainReader(&client_);

+ auto reader = handle_->obtainReader(&client_);

checkpoint.Call(1);

writer_->AddData(NewFixedData("Once "));

checkpoint.Call(2);

@@ -574,7 +574,7 @@ TEST_P(SharedMemoryDataConsumerHandleTest, ReleaseReader) {

EXPECT_CALL(checkpoint, Call(2));

checkpoint.Call(0);

- auto reader = handle_->ObtainReader(&client_);

+ auto reader = handle_->obtainReader(&client_);

checkpoint.Call(1);

reader.reset();

writer_->AddData(NewFixedData("Once "));

@@ -586,7 +586,7 @@ TEST_P(SharedMemoryDataConsumerHandleTest, TwoPhaseReadShouldWait) {

const void* buffer = &result;

size_t size = 99;

- auto reader = handle_->ObtainReader(nullptr);

+ auto reader = handle_->obtainReader(nullptr);

result = reader->beginRead(&buffer, kNone, &size);

EXPECT_EQ(kShouldWait, result);

EXPECT_EQ(nullptr, buffer);

@@ -600,7 +600,7 @@ TEST_P(SharedMemoryDataConsumerHandleTest, TwoPhaseReadSimple) {

const void* buffer = &result;

size_t size = 99;

- auto reader = handle_->ObtainReader(nullptr);

+ auto reader = handle_->obtainReader(nullptr);

result = reader->beginRead(&buffer, kNone, &size);

EXPECT_EQ(kOk, result);

EXPECT_EQ(5u, size);

@@ -671,7 +671,7 @@ TEST_P(SharedMemoryDataConsumerHandleTest, CallOnClearWhenDestructed2) {

handle_.reset(new SharedMemoryDataConsumerHandle(

kApplyBackpressure,

base::Bind(&DestructionTrackingFunction::Call, on_clear), &writer_));

- auto reader = handle_->ObtainReader(nullptr);

+ auto reader = handle_->obtainReader(nullptr);

handle_.reset();

on_clear = nullptr;

checkpoint.Call(1);

@@ -745,7 +745,7 @@ TEST_P(SharedMemoryDataConsumerHandleTest, TwoPhaseReadWithMultipleData) {

const void* buffer = &result;

size_t size = 99;

- auto reader = handle_->ObtainReader(nullptr);

+ auto reader = handle_->obtainReader(nullptr);

result = reader->beginRead(&buffer, kNone, &size);

EXPECT_EQ(kOk, result);

EXPECT_EQ(5u, size);

@@ -785,7 +785,7 @@ TEST_P(SharedMemoryDataConsumerHandleTest, ErrorRead) {

Result result;

char buffer[20] = {};

size_t read = 99;

- auto reader = handle_->ObtainReader(nullptr);

+ auto reader = handle_->obtainReader(nullptr);

writer_->Fail();

result = reader->read(buffer, sizeof(buffer), kNone, &read);

@@ -798,7 +798,7 @@ TEST_P(SharedMemoryDataConsumerHandleTest, ErrorTwoPhaseRead) {

Result result;

const void* pointer = &result;

size_t size = 99;

- auto reader = handle_->ObtainReader(nullptr);

+ auto reader = handle_->obtainReader(nullptr);

writer_->Fail();

result = reader->beginRead(&pointer, kNone, &size);

@@ -812,7 +812,7 @@ TEST_P(SharedMemoryDataConsumerHandleTest, FailWhileTwoPhaseReadIsInProgress) {

Result result;

const void* pointer = nullptr;

size_t size = 0;

- auto reader = handle_->ObtainReader(nullptr);

+ auto reader = handle_->obtainReader(nullptr);

writer_->AddData(NewFixedData("Once "));

result = reader->beginRead(&pointer, kNone, &size);

@@ -848,7 +848,7 @@ TEST_P(SharedMemoryDataConsumerHandleTest, FailWithClient) {

EXPECT_CALL(checkpoint, Call(3));

checkpoint.Call(0);

- auto reader = handle_->ObtainReader(&client_);

+ auto reader = handle_->obtainReader(&client_);

checkpoint.Call(1);

writer_->Fail();

checkpoint.Call(2);

@@ -869,7 +869,7 @@ TEST_P(SharedMemoryDataConsumerHandleTest, FailWithClientAndData) {

EXPECT_CALL(checkpoint, Call(4));

checkpoint.Call(0);

- auto reader = handle_->ObtainReader(&client_);

+ auto reader = handle_->obtainReader(&client_);

checkpoint.Call(1);

writer_->AddData(NewFixedData("Once "));

checkpoint.Call(2);

@@ -892,7 +892,7 @@ TEST_P(SharedMemoryDataConsumerHandleTest, RecursiveErrorNotification) {

EXPECT_CALL(checkpoint, Call(3));

checkpoint.Call(0);

- auto reader = handle_->ObtainReader(&client_);

+ auto reader = handle_->obtainReader(&client_);

checkpoint.Call(1);

writer_->AddData(NewFixedData("Once "));

checkpoint.Call(2);

@@ -919,7 +919,7 @@ TEST(SharedMemoryDataConsumerHandleBackpressureTest, Read) {

writer->AddData(

base::WrapUnique(new LoggingFixedReceivedData("data4", "time ", logger)));

- auto reader = handle->ObtainReader(nullptr);

+ auto reader = handle->obtainReader(nullptr);

logger->Add("1");

result = reader->read(buffer, 2, kNone, &size);

EXPECT_EQ(kOk, result);

@@ -962,7 +962,7 @@ TEST(SharedMemoryDataConsumerHandleBackpressureTest, CloseAndReset) {

writer->AddData(

base::WrapUnique(new LoggingFixedReceivedData("data3", "a ", logger)));

- auto reader = handle->ObtainReader(nullptr);

+ auto reader = handle->obtainReader(nullptr);

logger->Add("1");

result = reader->read(buffer, 2, kNone, &size);

EXPECT_EQ(kOk, result);

« no previous file with comments | « content/child/shared_memory_data_consumer_handle.cc ('k') | content/child/web_data_consumer_handle_impl.h » ('j') | no next file with comments »