Index: chrome/common/extensions/extension_localization_peer_unittest.cc |
diff --git a/chrome/common/extensions/extension_localization_peer_unittest.cc b/chrome/common/extensions/extension_localization_peer_unittest.cc |
index 135725dba05b3fba189a56e6bad6fa6959fb2013..d8ab17ef2c8385e2b04ff9cb6ee86f4bee859724 100644 |
--- a/chrome/common/extensions/extension_localization_peer_unittest.cc |
+++ b/chrome/common/extensions/extension_localization_peer_unittest.cc |
@@ -69,8 +69,9 @@ class MockResourceLoaderBridgePeer |
MOCK_METHOD3(OnReceivedData, void(const char* data, |
int data_length, |
int encoded_data_length)); |
- MOCK_METHOD3(OnCompletedRequest, void( |
+ MOCK_METHOD4(OnCompletedRequest, void( |
const net::URLRequestStatus& status, |
+ bool handled_externally, |
const std::string& security_info, |
const base::TimeTicks& completion_time)); |
@@ -142,11 +143,12 @@ TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestBadURLRequestStatus) { |
EXPECT_CALL(*original_peer_, OnReceivedResponse(_)); |
EXPECT_CALL(*original_peer_, OnCompletedRequest( |
- IsURLRequestEqual(net::URLRequestStatus::CANCELED), "", base::TimeTicks())); |
+ IsURLRequestEqual(net::URLRequestStatus::CANCELED), _, |
+ "", base::TimeTicks())); |
net::URLRequestStatus status; |
status.set_status(net::URLRequestStatus::FAILED); |
- filter_peer->OnCompletedRequest(status, "", base::TimeTicks()); |
+ filter_peer->OnCompletedRequest(status, false, "", base::TimeTicks()); |
} |
TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestEmptyData) { |
@@ -158,12 +160,12 @@ TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestEmptyData) { |
EXPECT_CALL(*original_peer_, OnReceivedResponse(_)); |
EXPECT_CALL(*original_peer_, OnCompletedRequest( |
- IsURLRequestEqual(net::URLRequestStatus::SUCCESS), "", |
+ IsURLRequestEqual(net::URLRequestStatus::SUCCESS), _, "", |
base::TimeTicks())); |
net::URLRequestStatus status; |
status.set_status(net::URLRequestStatus::SUCCESS); |
- filter_peer->OnCompletedRequest(status, "", base::TimeTicks()); |
+ filter_peer->OnCompletedRequest(status, false, "", base::TimeTicks()); |
} |
TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestNoCatalogs) { |
@@ -181,18 +183,18 @@ TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestNoCatalogs) { |
EXPECT_CALL(*original_peer_, OnReceivedResponse(_)).Times(2); |
EXPECT_CALL(*original_peer_, OnCompletedRequest( |
IsURLRequestEqual( |
- net::URLRequestStatus::SUCCESS), "", base::TimeTicks())).Times(2); |
+ net::URLRequestStatus::SUCCESS), _, "", base::TimeTicks())).Times(2); |
net::URLRequestStatus status; |
status.set_status(net::URLRequestStatus::SUCCESS); |
- filter_peer->OnCompletedRequest(status, "", base::TimeTicks()); |
+ filter_peer->OnCompletedRequest(status, false, "", base::TimeTicks()); |
// Test if Send gets called again (it shouldn't be) when first call returned |
// an empty dictionary. |
filter_peer = |
CreateExtensionLocalizationPeer("text/css", GURL(kExtensionUrl_1)); |
SetData(filter_peer, "some text"); |
- filter_peer->OnCompletedRequest(status, "", base::TimeTicks()); |
+ filter_peer->OnCompletedRequest(status, false, "", base::TimeTicks()); |
} |
TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestWithCatalogs) { |
@@ -218,12 +220,12 @@ TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestWithCatalogs) { |
EXPECT_CALL(*original_peer_, OnReceivedResponse(_)); |
EXPECT_CALL(*original_peer_, OnCompletedRequest( |
- IsURLRequestEqual(net::URLRequestStatus::SUCCESS), "", |
+ IsURLRequestEqual(net::URLRequestStatus::SUCCESS), _, "", |
base::TimeTicks())); |
net::URLRequestStatus status; |
status.set_status(net::URLRequestStatus::SUCCESS); |
- filter_peer->OnCompletedRequest(status, "", base::TimeTicks()); |
+ filter_peer->OnCompletedRequest(status, false, "", base::TimeTicks()); |
} |
TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestReplaceMessagesFails) { |
@@ -249,10 +251,10 @@ TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestReplaceMessagesFails) { |
EXPECT_CALL(*original_peer_, OnReceivedResponse(_)); |
EXPECT_CALL(*original_peer_, OnCompletedRequest( |
- IsURLRequestEqual(net::URLRequestStatus::SUCCESS), "", |
+ IsURLRequestEqual(net::URLRequestStatus::SUCCESS), _, "", |
base::TimeTicks())); |
net::URLRequestStatus status; |
status.set_status(net::URLRequestStatus::SUCCESS); |
- filter_peer->OnCompletedRequest(status, "", base::TimeTicks()); |
+ filter_peer->OnCompletedRequest(status, false, "", base::TimeTicks()); |
} |