Reland: URLRequestJob: change ReadRawData contract

mojo/services/network/url_loader_impl_apptest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "mojo/application/public/cpp/application_test_base.h"
@@ skipping 31 matching lines @@
     CHECK(!g_current_job);
     g_current_job = this;
   }
 
   Status status() { return status_; }
 
   int buf_size() { return buf_size_; }
 
   void Start() override { status_ = STARTED; }
 
-  bool ReadRawData(net::IOBuffer* buf, int buf_size, int* bytes_read) override {
+  int ReadRawData(net::IOBuffer* buf, int buf_size) override {
     status_ = READING;
     buf_size_ = buf_size;
-    SetStatus(net::URLRequestStatus(net::URLRequestStatus::IO_PENDING, 0));
-    return false;
+    return net::ERR_IO_PENDING;
   }
 
   void NotifyHeadersComplete() { net::URLRequestJob::NotifyHeadersComplete(); }
 
   void NotifyReadComplete(int bytes_read) {
     if (bytes_read < 0) {
-      NotifyDone(net::URLRequestStatus(
-          net::URLRequestStatus::FromError(net::ERR_FAILED)));
-      net::URLRequestJob::NotifyReadComplete(0);
+      // Map errors to net::ERR_FAILED.
+      ReadRawDataComplete(net::ERR_FAILED);
       // Set this after calling ReadRawDataComplete since that ends up calling
       // ReadRawData.
       status_ = COMPLETED;
     } else if (bytes_read == 0) {
-      NotifyDone(net::URLRequestStatus());
-      net::URLRequestJob::NotifyReadComplete(bytes_read);
+      ReadRawDataComplete(bytes_read);
       // Set this after calling ReadRawDataComplete since that ends up calling
       // ReadRawData.
       status_ = COMPLETED;
     } else {
-      SetStatus(net::URLRequestStatus());
-      net::URLRequestJob::NotifyReadComplete(bytes_read);
+      ReadRawDataComplete(bytes_read);
       // Set this after calling ReadRawDataComplete since that ends up calling
       // ReadRawData.
       status_ = STARTED;
     }
   }
 
  private:
   ~TestURLRequestJob() override {
     CHECK(g_current_job == this);
     g_current_job = nullptr;
@@ skipping 194 matching lines @@
 
   EXPECT_TRUE(IsUrlLoaderValid());
 
   g_current_job->NotifyReadComplete(-1);
 
   while (IsUrlLoaderValid())
     base::RunLoop().RunUntilIdle();
 }
 
 }  // namespace mojo