Index: net/url_request/url_request_http_job_unittest.cc |
diff --git a/net/url_request/url_request_http_job_unittest.cc b/net/url_request/url_request_http_job_unittest.cc |
index 6e0979d22f986ca5a37415c16a2753de387fc506..aa1599aa6cce1b56b906753b84491447423c7fff 100644 |
--- a/net/url_request/url_request_http_job_unittest.cc |
+++ b/net/url_request/url_request_http_job_unittest.cc |
@@ -162,7 +162,7 @@ |
ASSERT_TRUE(request->is_pending()); |
base::RunLoop().Run(); |
- EXPECT_THAT(delegate.request_status(), IsOk()); |
+ EXPECT_TRUE(request->status().is_success()); |
EXPECT_EQ(12, request->received_response_content_length()); |
EXPECT_EQ(CountWriteBytes(writes, arraysize(writes)), |
request->GetTotalSentBytes()); |
@@ -191,7 +191,7 @@ |
ASSERT_TRUE(request->is_pending()); |
base::RunLoop().Run(); |
- EXPECT_THAT(delegate.request_status(), IsOk()); |
+ EXPECT_TRUE(request->status().is_success()); |
EXPECT_EQ(12, request->received_response_content_length()); |
EXPECT_EQ(CountWriteBytes(writes, arraysize(writes)), |
request->GetTotalSentBytes()); |
@@ -222,7 +222,7 @@ |
ASSERT_TRUE(request->is_pending()); |
base::RunLoop().Run(); |
- EXPECT_THAT(delegate.request_status(), IsError(ERR_FAILED)); |
+ EXPECT_EQ(URLRequestStatus::FAILED, request->status().status()); |
EXPECT_EQ(12, request->received_response_content_length()); |
EXPECT_EQ(CountWriteBytes(writes, arraysize(writes)), |
request->GetTotalSentBytes()); |
@@ -254,7 +254,7 @@ |
request->Start(); |
base::RunLoop().RunUntilIdle(); |
- EXPECT_THAT(delegate.request_status(), IsError(ERR_ABORTED)); |
+ EXPECT_EQ(URLRequestStatus::CANCELED, request->status().status()); |
EXPECT_EQ(12, request->received_response_content_length()); |
EXPECT_EQ(CountWriteBytes(writes, arraysize(writes)), |
request->GetTotalSentBytes()); |
@@ -302,7 +302,7 @@ |
ASSERT_TRUE(request->is_pending()); |
base::RunLoop().RunUntilIdle(); |
- EXPECT_THAT(delegate.request_status(), IsOk()); |
+ EXPECT_TRUE(request->status().is_success()); |
EXPECT_EQ(12, request->received_response_content_length()); |
// Should not include the redirect. |
EXPECT_EQ(CountWriteBytes(final_writes, arraysize(final_writes)), |
@@ -334,7 +334,7 @@ |
request->Start(); |
base::RunLoop().RunUntilIdle(); |
- EXPECT_THAT(delegate.request_status(), IsError(ERR_ABORTED)); |
+ EXPECT_EQ(URLRequestStatus::CANCELED, request->status().status()); |
EXPECT_EQ(0, request->received_response_content_length()); |
EXPECT_EQ(CountWriteBytes(writes, arraysize(writes)), |
request->GetTotalSentBytes()); |
@@ -359,7 +359,7 @@ |
request->Cancel(); |
base::RunLoop().RunUntilIdle(); |
- EXPECT_THAT(delegate.request_status(), IsError(ERR_ABORTED)); |
+ EXPECT_EQ(URLRequestStatus::CANCELED, request->status().status()); |
EXPECT_EQ(0, request->received_response_content_length()); |
EXPECT_EQ(0, request->GetTotalSentBytes()); |
EXPECT_EQ(0, request->GetTotalReceivedBytes()); |
@@ -380,7 +380,7 @@ |
request->Cancel(); |
base::RunLoop().Run(); |
- EXPECT_THAT(delegate.request_status(), IsError(ERR_ABORTED)); |
+ EXPECT_EQ(URLRequestStatus::CANCELED, request->status().status()); |
} |
// Make sure that SetPriority actually sets the URLRequestHttpJob's |
@@ -567,7 +567,7 @@ |
request->Start(); |
base::RunLoop().RunUntilIdle(); |
- EXPECT_THAT(delegate.request_status(), IsOk()); |
+ EXPECT_TRUE(request->status().is_success()); |
// Second response should be from cache without notification of SdchObserver |
TestDelegate delegate2; |
@@ -576,7 +576,7 @@ |
request2->Start(); |
base::RunLoop().RunUntilIdle(); |
- EXPECT_THAT(delegate2.request_status(), IsOk()); |
+ EXPECT_TRUE(request->status().is_success()); |
// Cleanup manager. |
sdch_manager.RemoveObserver(&sdch_observer); |
@@ -613,7 +613,7 @@ |
request->Start(); |
base::RunLoop().RunUntilIdle(); |
- EXPECT_THAT(delegate.request_status(), IsOk()); |
+ EXPECT_TRUE(request->status().is_success()); |
EXPECT_EQ(12, request->received_response_content_length()); |
EXPECT_EQ(CountWriteBytes(writes, arraysize(writes)), |
request->GetTotalSentBytes()); |
@@ -648,7 +648,7 @@ |
request->Start(); |
base::RunLoop().RunUntilIdle(); |
- EXPECT_THAT(delegate.request_status(), IsOk()); |
+ EXPECT_TRUE(request->status().is_success()); |
EXPECT_EQ(12, request->received_response_content_length()); |
EXPECT_EQ(CountWriteBytes(writes, arraysize(writes)), |
request->GetTotalSentBytes()); |
@@ -798,7 +798,8 @@ |
TEST_F(URLRequestHttpJobWebSocketTest, RejectedWithoutCreateHelper) { |
req_->Start(); |
base::RunLoop().RunUntilIdle(); |
- EXPECT_THAT(delegate_.request_status(), IsError(ERR_DISALLOWED_URL_SCHEME)); |
+ EXPECT_EQ(URLRequestStatus::FAILED, req_->status().status()); |
+ EXPECT_THAT(req_->status().error(), IsError(ERR_DISALLOWED_URL_SCHEME)); |
} |
TEST_F(URLRequestHttpJobWebSocketTest, CreateHelperPassedThrough) { |
@@ -815,7 +816,7 @@ |
req_->SetLoadFlags(LOAD_DISABLE_CACHE); |
req_->Start(); |
base::RunLoop().RunUntilIdle(); |
- EXPECT_THAT(delegate_.request_status(), IsError(ERR_IO_PENDING)); |
+ EXPECT_EQ(URLRequestStatus::IO_PENDING, req_->status().status()); |
EXPECT_TRUE(fake_handshake_stream->initialize_stream_was_called()); |
} |