net/http/http_transaction_test_util.cc - Issue 1230113012: [net] Better StopCaching() handling for HttpCache::Transaction.

Unified Diff: net/http/http_transaction_test_util.cc

Issue 1230113012: [net] Better StopCaching() handling for HttpCache::Transaction. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Add missing MockTransaction initializers Created 5 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

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

Download patch

Index: net/http/http_transaction_test_util.cc

diff --git a/net/http/http_transaction_test_util.cc b/net/http/http_transaction_test_util.cc

index 926d8c695d63357eb7f85cdfd5afcf58442fdf28..f53b8b73d9f8fbd6072d85f994f07f471f839632 100644

--- a/net/http/http_transaction_test_util.cc

+++ b/net/http/http_transaction_test_util.cc

@@ -48,6 +48,7 @@ const MockTransaction kSimpleGET_Transaction = {

TEST_MODE_NORMAL,

nullptr,

+ nullptr,

OK};

@@ -65,45 +66,26 @@ const MockTransaction kSimplePOST_Transaction = {

TEST_MODE_NORMAL,

nullptr,

+ nullptr,

OK};

const MockTransaction kTypicalGET_Transaction = {

- "http://www.example.com/~foo/bar.html",

- "GET",

- base::Time(),

- "",

- LOAD_NORMAL,

- "HTTP/1.1 200 OK",

+ "http://www.example.com/~foo/bar.html", "GET", base::Time(), "",

rvargas (doing something else) 2015/09/19 01:09:34 ahhrrrgggg. this is ridiculous. Having a tool mess

+ LOAD_NORMAL, "HTTP/1.1 200 OK",

"Date: Wed, 28 Nov 2007 09:40:09 GMT\n"

"Last-Modified: Wed, 28 Nov 2007 00:40:09 GMT\n",

- base::Time(),

- "<html><body>Google Blah Blah</body></html>",

- TEST_MODE_NORMAL,

- nullptr,

- 0,

- OK};

+ base::Time(), "<html><body>Google Blah Blah</body></html>",

+ TEST_MODE_NORMAL, nullptr, nullptr, nullptr, 0, 0, OK};

const MockTransaction kETagGET_Transaction = {

- "http://www.google.com/foopy",

- "GET",

- base::Time(),

- "",

- LOAD_NORMAL,

+ "http://www.google.com/foopy", "GET", base::Time(), "", LOAD_NORMAL,

"HTTP/1.1 200 OK",

"Cache-Control: max-age=10000\n"

"Etag: \"foopy\"\n",

- base::Time(),

- "<html><body>Google Blah Blah</body></html>",

- TEST_MODE_NORMAL,

- nullptr,

- 0,

- OK};

+ base::Time(), "<html><body>Google Blah Blah</body></html>",

+ TEST_MODE_NORMAL, nullptr, nullptr, nullptr, 0, 0, OK};

const MockTransaction kRangeGET_Transaction = {

"http://www.google.com/",

@@ -118,6 +100,7 @@ const MockTransaction kRangeGET_Transaction = {

TEST_MODE_NORMAL,

nullptr,

+ nullptr,

OK};

@@ -141,7 +124,7 @@ const MockTransaction* FindMockTransaction(const GURL& url) {

if (url == GURL(kBuiltinMockTransactions[i]->url))

return kBuiltinMockTransactions[i];

}

- return NULL;

+ return nullptr;

}

void AddMockTransaction(const MockTransaction* trans) {

@@ -236,10 +219,12 @@ void TestTransactionConsumer::OnIOComplete(int result) {

MockNetworkTransaction::MockNetworkTransaction(RequestPriority priority,

MockNetworkLayer* factory)

- : request_(NULL),

+ : request_(nullptr),

data_cursor_(0),

+ content_length_(0),

priority_(priority),

- websocket_handshake_stream_create_helper_(NULL),

+ read_handler_(nullptr),

+ websocket_handshake_stream_create_helper_(nullptr),

transaction_factory_(factory->AsWeakPtr()),

received_bytes_(0),

sent_bytes_(0),

@@ -297,16 +282,22 @@ bool MockNetworkTransaction::IsReadyToRestartForAuth() {

status_line.find(" 407 ") != std::string::npos;

}

-int MockNetworkTransaction::Read(IOBuffer* buf,

+int MockNetworkTransaction::Read(net::IOBuffer* buf,

int buf_len,

const CompletionCallback& callback) {

- int data_len = static_cast<int>(data_.size());

- int num = std::min(buf_len, data_len - data_cursor_);

- if (test_mode_ & TEST_MODE_SLOW_READ)

- num = std::min(num, 1);

- if (num) {

- memcpy(buf->data(), data_.data() + data_cursor_, num);

+ int num = 0;

+ if (read_handler_) {

+ num = (*read_handler_)(content_length_, data_cursor_, buf, buf_len);

data_cursor_ += num;

+ } else {

+ int data_len = static_cast<int>(data_.size());

+ num = std::min(static_cast<int64>(buf_len), data_len - data_cursor_);

+ if (test_mode_ & TEST_MODE_SLOW_READ)

+ num = std::min(num, 1);

+ if (num) {

+ memcpy(buf->data(), data_.data() + data_cursor_, num);

+ data_cursor_ += num;

+ }

}

if (test_mode_ & TEST_MODE_SYNC_NET_READ)

return num;

@@ -400,6 +391,13 @@ int MockNetworkTransaction::StartInternal(const HttpRequestInfo* request,

if (!t)

return ERR_FAILED;

+ if (!before_network_start_callback_.is_null()) {

+ bool defer = false;

+ before_network_start_callback_.Run(&defer);

+ if (defer)

+ return net::ERR_IO_PENDING;

+ }

test_mode_ = t->test_mode;

// Return immediately if we're returning an error.

@@ -418,6 +416,8 @@ int MockNetworkTransaction::StartInternal(const HttpRequestInfo* request,

std::string resp_data = t->data;

if (t->handler)

(t->handler)(request, &resp_status, &resp_headers, &resp_data);

+ if (t->read_handler)

+ read_handler_ = t->read_handler;

std::string header_data = base::StringPrintf(

"%s\n%s\n", resp_status.c_str(), resp_headers.c_str());

@@ -440,6 +440,7 @@ int MockNetworkTransaction::StartInternal(const HttpRequestInfo* request,

response_.ssl_info.cert_status = t->cert_status;

response_.ssl_info.connection_status = t->ssl_connection_status;

data_ = resp_data;

+ content_length_ = response_.headers->GetContentLength();

if (net_log.net_log())

socket_log_id_ = net_log.net_log()->NextID();

@@ -456,6 +457,7 @@ int MockNetworkTransaction::StartInternal(const HttpRequestInfo* request,

void MockNetworkTransaction::SetBeforeNetworkStartCallback(

const BeforeNetworkStartCallback& callback) {

+ before_network_start_callback_ = callback;

}

void MockNetworkTransaction::SetBeforeProxyHeadersSentCallback(

@@ -502,6 +504,10 @@ void MockNetworkLayer::TransactionStopCaching() {

stop_caching_called_ = true;

}

+void MockNetworkLayer::ResetTransactionCount() {

+ transaction_count_ = 0;

int MockNetworkLayer::CreateTransaction(RequestPriority priority,

scoped_ptr<HttpTransaction>* trans) {

transaction_count_++;

« net/http/http_cache_transaction.cc ('K') | « net/http/http_transaction_test_util.h ('k') | net/http/mock_http_cache.h » ('j') | no next file with comments »