Revert r39446: "Fix the case where the browser livelocks if we cannot open a file."

This somehow broke net_unittests on the Mac.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39448 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 31 deletions

diff --git a/net/base/file_stream_win.cc b/net/base/file_stream_win.cc
index e1928a7..cec6a9d 100644
--- a/net/base/file_stream_win.cc
+++ b/net/base/file_stream_win.cc
@@ -120,10 +120,16 @@ FileStream::FileStream()
       open_flags_(0) {
 }
 
-FileStream::FileStream(base::PlatformFile file, int open_flags)
-    : file_(INVALID_HANDLE_VALUE),
-      open_flags_(0) {
-  Open(file, open_flags);
+FileStream::FileStream(base::PlatformFile file, int flags)
+    : file_(file),
+      open_flags_(flags) {
+  // If the file handle is opened with base::PLATFORM_FILE_ASYNC, we need to
+  // make sure we will perform asynchronous File IO to it.
+  if (flags & base::PLATFORM_FILE_ASYNC) {
+    async_context_.reset(new AsyncContext(this));
+    MessageLoopForIO::current()->RegisterIOHandler(file_,
+                                                   async_context_.get());
+  }
 }
 
 FileStream::~FileStream() {
@@ -141,13 +147,6 @@ void FileStream::Close() {
   }
 }
 
-void FileStream::Release() {
-  if (file_ != INVALID_HANDLE_VALUE)
-    CancelIo(file_);
-  async_context_.reset();
-  file_ = INVALID_HANDLE_VALUE;
-}
-
 int FileStream::Open(const FilePath& path, int open_flags) {
   if (IsOpen()) {
     DLOG(FATAL) << "File is already open!";
@@ -171,26 +170,6 @@ int FileStream::Open(const FilePath& path, int open_flags) {
   return OK;
 }
 
-int FileStream::Open(base::PlatformFile file, int open_flags) {
-  if (IsOpen()) {
-    DLOG(FATAL) << "File is already open!";
-    return ERR_UNEXPECTED;
-  }
-
-  open_flags_ = open_flags;
-  file_ = file;
-
-  // If the file handle is opened with base::PLATFORM_FILE_ASYNC, we need to
-  // make sure we will perform asynchronous File IO to it.
-  if (open_flags_ & base::PLATFORM_FILE_ASYNC) {
-    async_context_.reset(new AsyncContext(this));
-    MessageLoopForIO::current()->RegisterIOHandler(file_,
-                                                   async_context_.get());
-  }
-
-  return OK;
-}
-
 bool FileStream::IsOpen() const {
   return file_ != INVALID_HANDLE_VALUE;
 }