chrome/renderer/extensions/extension_localization_peer_unittest.cc - Issue 2510333002: Send encoded_body_length to renderer when response completed (2/3)

Unified Diff: chrome/renderer/extensions/extension_localization_peer_unittest.cc

Issue 2510333002: Send encoded_body_length to renderer when response completed (2/3) (Closed)

Patch Set: rebase Created 4 years, 1 month 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

Index: chrome/renderer/extensions/extension_localization_peer_unittest.cc

diff --git a/chrome/renderer/extensions/extension_localization_peer_unittest.cc b/chrome/renderer/extensions/extension_localization_peer_unittest.cc

index 587f0020f46cd6b489e25ed91a5437e9955afdb7..d7f59b5f05acc49ed451689aad5816ef477567ee 100644

--- a/chrome/renderer/extensions/extension_localization_peer_unittest.cc

+++ b/chrome/renderer/extensions/extension_localization_peer_unittest.cc

@@ -79,12 +79,13 @@ class MockRequestPeer : public content::RequestPeer {

void(const char* data,

int data_length,

int encoded_data_length));

- MOCK_METHOD5(OnCompletedRequest,

+ MOCK_METHOD6(OnCompletedRequest,

void(int error_code,

bool was_ignored_by_handler,

bool stale_copy_in_cache,

const base::TimeTicks& completion_time,

- int64_t total_transfer_size));

+ int64_t total_transfer_size,

+ int64_t encoded_body_size));

private:

DISALLOW_COPY_AND_ASSIGN(MockRequestPeer);

@@ -138,12 +139,12 @@ TEST_F(ExtensionLocalizationPeerTest, OnReceivedData) {

const std::string data_chunk("12345");

filter_peer_->OnReceivedData(base::MakeUnique<content::FixedReceivedData>(

- data_chunk.data(), data_chunk.length(), -1, 0));

+ data_chunk.data(), data_chunk.length(), -1));

EXPECT_EQ(data_chunk, GetData());

filter_peer_->OnReceivedData(base::MakeUnique<content::FixedReceivedData>(

- data_chunk.data(), data_chunk.length(), -1, 0));

+ data_chunk.data(), data_chunk.length(), -1));

EXPECT_EQ(data_chunk + data_chunk, GetData());

}

@@ -155,10 +156,10 @@ TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestBadURLRequestStatus) {

EXPECT_CALL(*original_peer_, OnReceivedResponse(_));

EXPECT_CALL(*original_peer_,

OnCompletedRequest(net::ERR_ABORTED, false, false,

- base::TimeTicks(), -1));

+ base::TimeTicks(), -1, 0));

filter_peer_->OnCompletedRequest(net::ERR_FAILED, false, false,

- base::TimeTicks(), -1);

+ base::TimeTicks(), -1, 0);

}

TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestEmptyData) {

@@ -168,11 +169,11 @@ TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestEmptyData) {

EXPECT_CALL(*sender_, Send(_)).Times(0);

EXPECT_CALL(*original_peer_, OnReceivedResponse(_));

- EXPECT_CALL(*original_peer_,

- OnCompletedRequest(net::OK, false, false, base::TimeTicks(), -1));

+ EXPECT_CALL(*original_peer_, OnCompletedRequest(net::OK, false, false,

+ base::TimeTicks(), -1, 0));

- filter_peer_->OnCompletedRequest(net::OK, false, false, base::TimeTicks(),

- -1);

+ filter_peer_->OnCompletedRequest(net::OK, false, false, base::TimeTicks(), -1,

+ 0);

}

TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestNoCatalogs) {

@@ -187,11 +188,11 @@ TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestNoCatalogs) {

EXPECT_CALL(*original_peer_,

OnReceivedDataInternal(StrEq(data.c_str()), data.length(), -1))

.Times(1);

- EXPECT_CALL(*original_peer_,

- OnCompletedRequest(net::OK, false, false, base::TimeTicks(), -1))

+ EXPECT_CALL(*original_peer_, OnCompletedRequest(net::OK, false, false,

+ base::TimeTicks(), -1, -1))

.Times(1);

- filter_peer_->OnCompletedRequest(net::OK, false, false, base::TimeTicks(),

+ filter_peer_->OnCompletedRequest(net::OK, false, false, base::TimeTicks(), -1,

-1);

// Test if Send gets called again (it shouldn't be) when first call returned

@@ -201,11 +202,11 @@ TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestNoCatalogs) {

EXPECT_CALL(*original_peer_,

OnReceivedDataInternal(StrEq(data.c_str()), data.length(), -1))

.Times(1);

- EXPECT_CALL(*original_peer_,

- OnCompletedRequest(net::OK, false, false, base::TimeTicks(), -1))

+ EXPECT_CALL(*original_peer_, OnCompletedRequest(net::OK, false, false,

+ base::TimeTicks(), -1, -1))

.Times(1);

SetData("some text");

- filter_peer_->OnCompletedRequest(net::OK, false, false, base::TimeTicks(),

+ filter_peer_->OnCompletedRequest(net::OK, false, false, base::TimeTicks(), -1,

-1);

}

@@ -229,10 +230,10 @@ TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestWithCatalogs) {

EXPECT_CALL(*original_peer_,

OnReceivedDataInternal(StrEq(data.c_str()), data.length(), -1));

- EXPECT_CALL(*original_peer_,

- OnCompletedRequest(net::OK, false, false, base::TimeTicks(), -1));

+ EXPECT_CALL(*original_peer_, OnCompletedRequest(net::OK, false, false,

+ base::TimeTicks(), -1, -1));

- filter_peer_->OnCompletedRequest(net::OK, false, false, base::TimeTicks(),

+ filter_peer_->OnCompletedRequest(net::OK, false, false, base::TimeTicks(), -1,

-1);

}

@@ -256,9 +257,9 @@ TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestReplaceMessagesFails) {

EXPECT_CALL(*original_peer_, OnReceivedDataInternal(StrEq(message.c_str()),

message.length(), -1));

- EXPECT_CALL(*original_peer_,

- OnCompletedRequest(net::OK, false, false, base::TimeTicks(), -1));

+ EXPECT_CALL(*original_peer_, OnCompletedRequest(net::OK, false, false,

+ base::TimeTicks(), -1, 0));

- filter_peer_->OnCompletedRequest(net::OK, false, false, base::TimeTicks(),

- -1);

+ filter_peer_->OnCompletedRequest(net::OK, false, false, base::TimeTicks(), -1,

+ 0);

}

« no previous file with comments | « chrome/renderer/extensions/extension_localization_peer.cc ('k') | chrome/renderer/security_filter_peer.h » ('j') | no next file with comments »