Use modifed URLRequest API in net/url_request/url_request unittests

net/url_request/url_request_simple_job_unittest.cc

Index: net/url_request/url_request_simple_job_unittest.cc
diff --git a/net/url_request/url_request_simple_job_unittest.cc b/net/url_request/url_request_simple_job_unittest.cc
index ab9eee732d7e94b606b96e24e2191f5816a713b0..a764f7e79b99561da7cc5fcf989fa3f54de81838 100644
--- a/net/url_request/url_request_simple_job_unittest.cc
+++ b/net/url_request/url_request_simple_job_unittest.cc
@@ -88,11 +88,6 @@ class CancelAfterFirstReadURLRequestDelegate : public TestDelegate {
     run_loop_->Quit();
   }
 
-  void OnReadCompleted(URLRequest* request, int bytes_read) override {
-    // Read should have been cancelled.
-    EXPECT_EQ(ERR_ABORTED, bytes_read);
-  }
-
   void WaitUntilHeadersReceived() const { run_loop_->Run(); }
 
  private:
@@ -163,7 +158,7 @@ class URLRequestSimpleJobTest : public ::testing::Test {
 
 TEST_F(URLRequestSimpleJobTest, SimpleRequest) {
   StartRequest(NULL);
-  ASSERT_TRUE(request_->status().is_success());
+  EXPECT_THAT(delegate_.request_status(), IsOk());
   EXPECT_EQ(kTestData, delegate_.data_received());
 }
 
@@ -178,7 +173,7 @@ TEST_F(URLRequestSimpleJobTest, RangeRequest) {
 
   StartRequest(&headers);
 
-  ASSERT_TRUE(request_->status().is_success());
+  EXPECT_THAT(delegate_.request_status(), IsOk());
   EXPECT_EQ(kExpectedBody, delegate_.data_received());
 }
 
@@ -195,8 +190,7 @@ TEST_F(URLRequestSimpleJobTest, MultipleRangeRequest) {
   StartRequest(&headers);
 
   EXPECT_TRUE(delegate_.request_failed());
-  EXPECT_THAT(request_->status().error(),
-              IsError(ERR_REQUEST_RANGE_NOT_SATISFIABLE));
+  EXPECT_EQ(ERR_REQUEST_RANGE_NOT_SATISFIABLE, delegate_.request_status());
 }
 
 TEST_F(URLRequestSimpleJobTest, InvalidRangeRequest) {
@@ -207,7 +201,7 @@ TEST_F(URLRequestSimpleJobTest, InvalidRangeRequest) {
 
   StartRequest(&headers);
 
-  ASSERT_TRUE(request_->status().is_success());
+  EXPECT_THAT(delegate_.request_status(), IsOk());
   EXPECT_EQ(kTestData, delegate_.data_received());
 }
 
@@ -215,7 +209,7 @@ TEST_F(URLRequestSimpleJobTest, EmptyDataRequest) {
   request_ =
       context_.CreateRequest(GURL("data:empty"), DEFAULT_PRIORITY, &delegate_);
   StartRequest(nullptr);
-  ASSERT_TRUE(request_->status().is_success());
+  EXPECT_THAT(delegate_.request_status(), IsOk());
   EXPECT_EQ("", delegate_.data_received());
 }
 
@@ -226,7 +220,7 @@ TEST_F(URLRequestSimpleJobTest, CancelBeforeResponseStarts) {
   request_->Cancel();
 
   base::RunLoop().RunUntilIdle();
-  EXPECT_EQ(URLRequestStatus::CANCELED, request_->status().status());
+  EXPECT_THAT(delegate_.request_status(), IsError(ERR_ABORTED));
   EXPECT_EQ(1, delegate_.response_started_count());
 }
 
@@ -244,7 +238,7 @@ TEST_F(URLRequestSimpleJobTest, CancelAfterFirstReadStarted) {
       FROM_HERE, base::Bind(&base::DoNothing), run_loop.QuitClosure()));
   run_loop.Run();
 
-  EXPECT_EQ(URLRequestStatus::CANCELED, request_->status().status());
+  EXPECT_THAT(cancel_delegate.request_status(), IsError(ERR_ABORTED));
   EXPECT_EQ(1, cancel_delegate.response_started_count());
   EXPECT_EQ("", cancel_delegate.data_received());
   // Destroy the request so it doesn't outlive its delegate.