Fix the case where the browser livelocks if we cannot open a file.

net/base/file_stream_win.cc

 // Copyright (c) 2008 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/base/file_stream.h"
 
 #include <windows.h>
 
 #include "base/file_path.h"
 #include "base/logging.h"
@@ skipping 102 matching lines @@
   temp->Run(result);
 }
 
 // FileStream ------------------------------------------------------------
 
 FileStream::FileStream()
     : file_(INVALID_HANDLE_VALUE),
       open_flags_(0) {
 }
 
-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(base::PlatformFile file, int open_flags)
+    : file_(INVALID_HANDLE_VALUE),
+      open_flags_(0) {
+  Open(file, open_flags);
 }
 
 FileStream::~FileStream() {
   Close();
 }
 
 void FileStream::Close() {
   if (file_ != INVALID_HANDLE_VALUE)
     CancelIo(file_);
 
   async_context_.reset();
   if (file_ != INVALID_HANDLE_VALUE) {
     CloseHandle(file_);
     file_ = INVALID_HANDLE_VALUE;
   }
 }
 
+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!";
     return ERR_UNEXPECTED;
   }
 
   open_flags_ = open_flags;
   file_ = base::CreatePlatformFile(path.value(), open_flags_, NULL);
   if (file_ == INVALID_HANDLE_VALUE) {
     DWORD error = GetLastError();
     LOG(WARNING) << "Failed to open file: " << error;
     return MapErrorCode(error);
   }
 
   if (open_flags_ & base::PLATFORM_FILE_ASYNC) {
     async_context_.reset(new AsyncContext(this));
     MessageLoopForIO::current()->RegisterIOHandler(file_,
                                                    async_context_.get());
   }
 
   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;
 }
 
 int64 FileStream::Seek(Whence whence, int64 offset) {
   if (!IsOpen())
     return ERR_UNEXPECTED;
   DCHECK(!async_context_.get() || !async_context_->callback());
 
   LARGE_INTEGER distance, result;
@@ skipping 133 matching lines @@
     DWORD error = GetLastError();
     LOG(WARNING) << "SetEndOfFile failed: " << error;
     return MapErrorCode(error);
   }
 
   // Success.
   return seek_position;
 }
 
 }  // namespace net