Revert of Adjust callers and networking delegates in net/ to modified APIs

net/url_request/url_request_file_dir_job_unittest.cc

 // Copyright 2016 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 "net/url_request/url_request_file_dir_job.h"
 
 #include <memory>
 #include <string>
 
 #include "base/files/file_path.h"
@@ skipping 107 matching lines @@
 
   request->Start();
   ASSERT_TRUE(directory.Delete());
 
   // Since the DirectoryLister is running on the network thread, this
   // will spin the message loop until the read error is returned to the
   // URLRequestFileDirJob.
   base::RunLoop().RunUntilIdle();
   ASSERT_TRUE(delegate_.got_response_started());
 
-  int bytes_read = request->Read(buffer_.get(), kBufferSize);
+  int bytes_read = 0;
+  EXPECT_FALSE(request->Read(buffer_.get(), kBufferSize, &bytes_read));
 
   // The URLRequestFileDirJobShould return the cached read error synchronously.
   // If it's not returned synchronously, the code path this is intended to test
   // was not executed.
-  EXPECT_THAT(bytes_read, IsError(ERR_FILE_NOT_FOUND));
+  EXPECT_THAT(request->status().ToNetError(), IsError(ERR_FILE_NOT_FOUND));
 }
 
 // Test the case where reading the response completes synchronously.
 TEST_F(URLRequestFileDirTest, DirectoryWithASingleFileSync) {
   base::ScopedTempDir directory;
   ASSERT_TRUE(directory.CreateUniqueTempDir());
   base::FilePath path;
   base::CreateTemporaryFileInDir(directory.path(), &path);
 
   TestJobFactory factory(directory.path());
   context_.set_job_factory(&factory);
 
   std::unique_ptr<URLRequest> request(context_.CreateRequest(
       FilePathToFileURL(path), DEFAULT_PRIORITY, &delegate_));
   request->Start();
   EXPECT_TRUE(request->is_pending());
 
   // Since the DirectoryLister is running on the network thread, this will spin
   // the message loop until the URLRequetsFileDirJob has received the
   // entire directory listing and cached it.
   base::RunLoop().RunUntilIdle();
 
+  int bytes_read = 0;
   // This will complete synchronously, since the URLRequetsFileDirJob had
   // directory listing cached in memory.
-  int bytes_read = request->Read(buffer_.get(), kBufferSize);
+  EXPECT_TRUE(request->Read(buffer_.get(), kBufferSize, &bytes_read));
+
+  EXPECT_EQ(URLRequestStatus::SUCCESS, request->status().status());
 
   ASSERT_GT(bytes_read, 0);
   ASSERT_LE(bytes_read, kBufferSize);
   std::string data(buffer_->data(), bytes_read);
   EXPECT_TRUE(data.find(directory.path().BaseName().MaybeAsASCII()) !=
               std::string::npos);
   EXPECT_TRUE(data.find(path.BaseName().MaybeAsASCII()) != std::string::npos);
 }
 
 // Test the case where reading the response completes asynchronously.
@@ skipping 75 matching lines @@
   ASSERT_GT(delegate.bytes_received(), 0);
   ASSERT_LE(delegate.bytes_received(), kBufferSize);
   EXPECT_TRUE(delegate.data_received().find(
                   directory.path().BaseName().MaybeAsASCII()) !=
               std::string::npos);
 }
 
 }  // namespace
 
 }  // namespace net