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

Unified Diff: components/domain_reliability/uploader_unittest.cc

Issue 2824813002: Remove URLRequestJob::GetResponseCode implementations. (Closed)
Patch Set: Fix more stuff Created 3 years, 8 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: components/domain_reliability/uploader_unittest.cc
diff --git a/components/domain_reliability/uploader_unittest.cc b/components/domain_reliability/uploader_unittest.cc
index 0b99fc0655df8652868801a508cd2c30c8515e5b..ae037e9b03526b3fd8ef92c55362d9c69fc4afa3 100644
--- a/components/domain_reliability/uploader_unittest.cc
+++ b/components/domain_reliability/uploader_unittest.cc
@@ -33,7 +33,6 @@ const char kUploadURL[] = "https://example/upload";
struct MockUploadResult {
int net_error;
- int response_code;
scoped_refptr<net::HttpResponseHeaders> response_headers;
};
@@ -95,10 +94,6 @@ class UploadMockURLRequestJob : public net::URLRequestJob {
NotifyStartError(net::URLRequestStatus::FromError(result_.net_error));
}
- int GetResponseCode() const override {
- return result_.response_code;
- }
-
void GetResponseInfo(net::HttpResponseInfo* info) override {
info->headers = result_.response_headers;
}
@@ -135,23 +130,12 @@ class UploadInterceptor : public net::URLRequestInterceptor {
void ExpectRequestAndReturnError(int net_error) {
MockUploadResult result;
result.net_error = net_error;
- result.response_code = -1;
- results_.push_back(result);
- }
-
- void ExpectRequestAndReturnResponseCode(int response_code) {
- MockUploadResult result;
- result.net_error = net::OK;
- result.response_code = response_code;
results_.push_back(result);
}
- void ExpectRequestAndReturnResponseCodeAndHeaders(
- int response_code,
- const char* headers) {
+ void ExpectRequestAndReturnResponseHeaders(const char* headers) {
MockUploadResult result;
result.net_error = net::OK;
- result.response_code = response_code;
result.response_headers = new net::HttpResponseHeaders(
net::HttpUtil::AssembleRawHeaders(headers, strlen(headers)));
results_.push_back(result);
@@ -226,7 +210,7 @@ TEST_F(DomainReliabilityUploaderTest, Null) {
}
TEST_F(DomainReliabilityUploaderTest, SuccessfulUpload) {
- interceptor()->ExpectRequestAndReturnResponseCode(200);
+ interceptor()->ExpectRequestAndReturnResponseHeaders("HTTP/1.1 200\r\n\r\n");
TestUploadCallback c;
uploader()->UploadReport("{}", 0, GURL(kUploadURL), c.callback());
@@ -250,7 +234,7 @@ TEST_F(DomainReliabilityUploaderTest, NetworkErrorUpload) {
}
TEST_F(DomainReliabilityUploaderTest, ServerErrorUpload) {
- interceptor()->ExpectRequestAndReturnResponseCode(500);
+ interceptor()->ExpectRequestAndReturnResponseHeaders("HTTP/1.1 500\r\n\r\n");
TestUploadCallback c;
uploader()->UploadReport("{}", 0, GURL(kUploadURL), c.callback());
@@ -262,8 +246,7 @@ TEST_F(DomainReliabilityUploaderTest, ServerErrorUpload) {
}
TEST_F(DomainReliabilityUploaderTest, RetryAfterUpload) {
- interceptor()->ExpectRequestAndReturnResponseCodeAndHeaders(
- 503,
+ interceptor()->ExpectRequestAndReturnResponseHeaders(
"HTTP/1.1 503 Ugh\nRetry-After: 3600\n\n");
TestUploadCallback c;
@@ -276,7 +259,7 @@ TEST_F(DomainReliabilityUploaderTest, RetryAfterUpload) {
}
TEST_F(DomainReliabilityUploaderTest, UploadDepth1) {
- interceptor()->ExpectRequestAndReturnResponseCode(200);
+ interceptor()->ExpectRequestAndReturnResponseHeaders("HTTP/1.1 200\r\n\r\n");
TestUploadCallback c;
uploader()->UploadReport("{}", 0, GURL(kUploadURL), c.callback());
@@ -289,7 +272,7 @@ TEST_F(DomainReliabilityUploaderTest, UploadDepth1) {
}
TEST_F(DomainReliabilityUploaderTest, UploadDepth2) {
- interceptor()->ExpectRequestAndReturnResponseCode(200);
+ interceptor()->ExpectRequestAndReturnResponseHeaders("HTTP/1.1 200\r\n\r\n");
TestUploadCallback c;
uploader()->UploadReport("{}", 1, GURL(kUploadURL), c.callback());

Powered by Google App Engine
This is Rietveld 408576698