Remove Deprecated OnResponseStarted.

Remove deprecated OnResponseStarted(URLRequest*),
use OnResponseStarted(URLRequest*, int) instead.

BUG=488603

TBR=servolk@chromium.org, irisu@chromium.org, ichikawa@chromium.org
Signed-off-by: zhuoyu.qian <zhuoyu.qian@samsung.com>
Cq-Include-Trybots: master.tryserver.chromium.android:android_cronet_tester;master.tryserver.chromium.mac:ios-simulator-cronet
Change-Id: I4cde46481a3f8e20bc1e9cef9711caf5b0c6d7af
Reviewed-on: https://chromium-review.googlesource.com/763193Reviewed-by: Sergey Volk <servolk@chromium.org>
Reviewed-by: Matt Falkenhagen <falken@chromium.org>
Reviewed-by: Matt Menke <mmenke@chromium.org>
Commit-Queue: Matt Menke <mmenke@chromium.org>
Cr-Commit-Position: refs/heads/master@{#516001}

chromecast/net/connectivity_checker_impl.cc

@@ -173,10 +173,11 @@ void ConnectivityCheckerImpl::OnNetworkChangedInternal() {
   Check();
 }
 
-void ConnectivityCheckerImpl::OnResponseStarted(net::URLRequest* request) {
+void ConnectivityCheckerImpl::OnResponseStarted(net::URLRequest* request,
+                                                int net_error) {
   DCHECK(task_runner_->BelongsToCurrentThread());
   int http_response_code =
-      (request->status().is_success() &&
+      (net_error == net::OK &&
        request->response_info().headers.get() != nullptr)
           ? request->response_info().headers->response_code()
           : net::HTTP_BAD_REQUEST;

chromecast/net/connectivity_checker_impl.h

@@ -47,7 +47,7 @@ class ConnectivityCheckerImpl
 
  private:
   // UrlRequest::Delegate implementation:
-  void OnResponseStarted(net::URLRequest* request) override;
+  void OnResponseStarted(net::URLRequest* request, int net_error) override;
   void OnReadCompleted(net::URLRequest* request, int bytes_read) override;
   void OnSSLCertificateError(net::URLRequest* request,
                              const net::SSLInfo& ssl_info,

content/browser/loader/resource_loader.cc

@@ -418,14 +418,14 @@ void ResourceLoader::OnSSLCertificateError(net::URLRequest* request,
       info->GetWebContentsGetterForRequest(), ssl_info, fatal);
 }
 
-void ResourceLoader::OnResponseStarted(net::URLRequest* unused) {
+void ResourceLoader::OnResponseStarted(net::URLRequest* unused, int net_error) {
   TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("loading"),
                "ResourceLoader::OnResponseStarted");
   DCHECK_EQ(request_.get(), unused);
 
   DVLOG(1) << "OnResponseStarted: " << request_->url().spec();
 
-  if (!request_->status().is_success()) {
+  if (net_error != net::OK) {
     ResponseCompleted();
     return;
   }

content/browser/loader/resource_loader.h

@@ -75,7 +75,7 @@ class CONTENT_EXPORT ResourceLoader : public net::URLRequest::Delegate,
   void OnSSLCertificateError(net::URLRequest* request,
                              const net::SSLInfo& info,
                              bool fatal) override;
-  void OnResponseStarted(net::URLRequest* request) override;
+  void OnResponseStarted(net::URLRequest* request, int net_error) override;
   void OnReadCompleted(net::URLRequest* request, int bytes_read) override;
 
   // SSLErrorHandler::Delegate implementation:

content/browser/service_worker/service_worker_blob_reader.cc

@@ -51,8 +51,9 @@ void ServiceWorkerBlobReader::OnSSLCertificateError(
   NOTREACHED();
 }
 
-void ServiceWorkerBlobReader::OnResponseStarted(net::URLRequest* request) {
-  // TODO(falken): This should check request->status() per URLRequest::Delegate
+void ServiceWorkerBlobReader::OnResponseStarted(net::URLRequest* request,
+                                                int net_error) {
+  // TODO(falken): This should check net_error per URLRequest::Delegate
   // contract.
   // TODO(falken): Add Content-Length, Content-Type if they were not provided in
   // the ServiceWorkerResponse.

content/browser/service_worker/service_worker_blob_reader.h

@@ -45,7 +45,7 @@ class ServiceWorkerBlobReader : public net::URLRequest::Delegate {
   void OnSSLCertificateError(net::URLRequest* request,
                              const net::SSLInfo& ssl_info,
                              bool fatal) override;
-  void OnResponseStarted(net::URLRequest* request) override;
+  void OnResponseStarted(net::URLRequest* request, int net_error) override;
   void OnReadCompleted(net::URLRequest* request, int bytes_read) override;
 
  private:

headless/public/util/testing/generic_url_request_mocks.cc

@@ -164,7 +164,8 @@ void MockCookieStore::SendCookies(const GURL& url,
 MockURLRequestDelegate::MockURLRequestDelegate() {}
 MockURLRequestDelegate::~MockURLRequestDelegate() {}
 
-void MockURLRequestDelegate::OnResponseStarted(net::URLRequest* request) {}
+void MockURLRequestDelegate::OnResponseStarted(net::URLRequest* request,
+                                               int net_error) {}
 void MockURLRequestDelegate::OnReadCompleted(net::URLRequest* request,
                                              int bytes_read) {}
 const std::string& MockURLRequestDelegate::response_data() const {

headless/public/util/testing/generic_url_request_mocks.h

@@ -129,7 +129,7 @@ class MockURLRequestDelegate : public net::URLRequest::Delegate {
   MockURLRequestDelegate();
   ~MockURLRequestDelegate() override;
 
-  void OnResponseStarted(net::URLRequest* request) override;
+  void OnResponseStarted(net::URLRequest* request, int net_error) override;
   void OnReadCompleted(net::URLRequest* request, int bytes_read) override;
   const std::string& response_data() const;
   const net::IOBufferWithSize* metadata() const;

ios/web_view/internal/web_view_network_delegate.cc

@@ -42,7 +42,8 @@ int WebViewNetworkDelegate::OnHeadersReceived(
 void WebViewNetworkDelegate::OnBeforeRedirect(net::URLRequest* request,
                                               const GURL& new_location) {}
 
-void WebViewNetworkDelegate::OnResponseStarted(net::URLRequest* request) {}
+void WebViewNetworkDelegate::OnResponseStarted(net::URLRequest* request,
+                                               int net_error) {}
 
 void WebViewNetworkDelegate::OnNetworkBytesReceived(net::URLRequest* request,
                                                     int64_t bytes_received) {}

ios/web_view/internal/web_view_network_delegate.h

@@ -34,7 +34,7 @@ class WebViewNetworkDelegate : public net::NetworkDelegateImpl {
       GURL* allowed_unsafe_redirect_url) override;
   void OnBeforeRedirect(net::URLRequest* request,
                         const GURL& new_location) override;
-  void OnResponseStarted(net::URLRequest* request) override;
+  void OnResponseStarted(net::URLRequest* request, int net_error) override;
   void OnNetworkBytesReceived(net::URLRequest* request,
                               int64_t bytes_received) override;
   void OnCompleted(net::URLRequest* request, bool started) override;

net/base/network_delegate.cc

@@ -206,11 +206,6 @@ bool NetworkDelegate::CanUseReportingClient(const url::Origin& origin,
 }
 
 void NetworkDelegate::OnResponseStarted(URLRequest* request, int net_error) {
-  OnResponseStarted(request);
-}
-
-// Deprecated
-void NetworkDelegate::OnResponseStarted(URLRequest* request) {
   NOTREACHED();
 }
 

net/base/network_delegate.h

@@ -206,8 +206,6 @@ class NET_EXPORT NetworkDelegate {
 
   // This corresponds to URLRequestDelegate::OnResponseStarted.
   virtual void OnResponseStarted(URLRequest* request, int net_error);
-  // Deprecated.
-  virtual void OnResponseStarted(URLRequest* request);
 
   // Called when bytes are received from the network, such as after receiving
   // headers or reading raw response bytes. This includes localhost requests.

net/base/network_delegate_impl.cc

@@ -44,12 +44,7 @@ void NetworkDelegateImpl::OnBeforeRedirect(URLRequest* request,
                                            const GURL& new_location) {}
 
 void NetworkDelegateImpl::OnResponseStarted(URLRequest* request,
-                                            int net_error) {
-  OnResponseStarted(request);
-}
-
-// Deprecated.
-void NetworkDelegateImpl::OnResponseStarted(URLRequest* request) {}
+                                            int net_error) {}
 
 void NetworkDelegateImpl::OnNetworkBytesReceived(URLRequest* request,
                                                  int64_t bytes_received) {}

net/base/network_delegate_impl.h

@@ -63,7 +63,6 @@ class NET_EXPORT NetworkDelegateImpl : public NetworkDelegate {
   void OnBeforeRedirect(URLRequest* request, const GURL& new_location) override;
 
   void OnResponseStarted(URLRequest* request, int net_error) override;
-  void OnResponseStarted(URLRequest* request) override;
 
   void OnNetworkBytesReceived(URLRequest* request,
                               int64_t bytes_received) override;

net/url_request/url_request.cc

@@ -161,10 +161,6 @@ void URLRequest::Delegate::OnSSLCertificateError(URLRequest* request,
 
 void URLRequest::Delegate::OnResponseStarted(URLRequest* request,
                                              int net_error) {
-  OnResponseStarted(request);
-}
-
-void URLRequest::Delegate::OnResponseStarted(URLRequest* request) {
   NOTREACHED();
 }
 

net/url_request/url_request.h

@@ -216,9 +216,6 @@ class NET_EXPORT URLRequest : public base::SupportsUserData {
     // meta data about the response is available, including for example HTTP
     // response headers if this is a request for a HTTP resource.
     virtual void OnResponseStarted(URLRequest* request, int net_error);
-    // Deprecated.
-    // TODO(maksims): Remove this;
-    virtual void OnResponseStarted(URLRequest* request);
 
     // Called when the a Read of the response body is completed after an
     // IO_PENDING status from a Read() call.