Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1353)

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

Issue 10640019: Remove the HANDLED_EXTERNALLY status code. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fixed some minor issues Created 8 years, 6 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: 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..98b8c26b4f2410ec0246c8fcebc9cbca1c29f05d 100644
--- a/chrome/common/extensions/extension_localization_peer_unittest.cc
+++ b/chrome/common/extensions/extension_localization_peer_unittest.cc
@@ -70,7 +70,7 @@ class MockResourceLoaderBridgePeer
int data_length,
int encoded_data_length));
MOCK_METHOD3(OnCompletedRequest, void(
- const net::URLRequestStatus& status,
+ int error_code,
const std::string& security_info,
const base::TimeTicks& completion_time));
@@ -142,11 +142,9 @@ TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestBadURLRequestStatus) {
EXPECT_CALL(*original_peer_, OnReceivedResponse(_));
EXPECT_CALL(*original_peer_, OnCompletedRequest(
- IsURLRequestEqual(net::URLRequestStatus::CANCELED), "", base::TimeTicks()));
+ net::ERR_ABORTED, "", base::TimeTicks()));
- net::URLRequestStatus status;
- status.set_status(net::URLRequestStatus::FAILED);
- filter_peer->OnCompletedRequest(status, "", base::TimeTicks());
+ filter_peer->OnCompletedRequest(net::ERR_FAILED, "", base::TimeTicks());
}
TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestEmptyData) {
@@ -158,12 +156,9 @@ TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestEmptyData) {
EXPECT_CALL(*original_peer_, OnReceivedResponse(_));
EXPECT_CALL(*original_peer_, OnCompletedRequest(
- IsURLRequestEqual(net::URLRequestStatus::SUCCESS), "",
- base::TimeTicks()));
+ net::OK, "", base::TimeTicks()));
- net::URLRequestStatus status;
- status.set_status(net::URLRequestStatus::SUCCESS);
- filter_peer->OnCompletedRequest(status, "", base::TimeTicks());
+ filter_peer->OnCompletedRequest(net::OK, "", base::TimeTicks());
}
TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestNoCatalogs) {
@@ -180,19 +175,16 @@ 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::OK, "", base::TimeTicks())).Times(2);
- net::URLRequestStatus status;
- status.set_status(net::URLRequestStatus::SUCCESS);
- filter_peer->OnCompletedRequest(status, "", base::TimeTicks());
+ filter_peer->OnCompletedRequest(net::OK, "", 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(net::OK, "", base::TimeTicks());
}
TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestWithCatalogs) {
@@ -218,12 +210,9 @@ TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestWithCatalogs) {
EXPECT_CALL(*original_peer_, OnReceivedResponse(_));
EXPECT_CALL(*original_peer_, OnCompletedRequest(
- IsURLRequestEqual(net::URLRequestStatus::SUCCESS), "",
- base::TimeTicks()));
+ net::OK, "", base::TimeTicks()));
- net::URLRequestStatus status;
- status.set_status(net::URLRequestStatus::SUCCESS);
- filter_peer->OnCompletedRequest(status, "", base::TimeTicks());
+ filter_peer->OnCompletedRequest(net::OK, "", base::TimeTicks());
}
TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestReplaceMessagesFails) {
@@ -249,10 +238,7 @@ TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestReplaceMessagesFails) {
EXPECT_CALL(*original_peer_, OnReceivedResponse(_));
EXPECT_CALL(*original_peer_, OnCompletedRequest(
- IsURLRequestEqual(net::URLRequestStatus::SUCCESS), "",
- base::TimeTicks()));
+ net::OK, "", base::TimeTicks()));
- net::URLRequestStatus status;
- status.set_status(net::URLRequestStatus::SUCCESS);
- filter_peer->OnCompletedRequest(status, "", base::TimeTicks());
+ filter_peer->OnCompletedRequest(net::OK, "", base::TimeTicks());
}

Powered by Google App Engine
This is Rietveld 408576698