diff options
| author | mkwst@chromium.org <mkwst@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-03 06:44:58 +0000 |
|---|---|---|
| committer | mkwst@chromium.org <mkwst@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-03 06:44:58 +0000 |
| commit | 676bfd3221b2b70db1a278d5193760278b0219f9 (patch) | |
| tree | 3bd61bf0ca8098afefe7769d0b17721b37aff8f5 /net | |
| parent | 8ed7e7534ba6bc3211eb4bb19a55e8690c76c57c (diff) | |
| download | chromium_src-676bfd3221b2b70db1a278d5193760278b0219f9.zip chromium_src-676bfd3221b2b70db1a278d5193760278b0219f9.tar.gz chromium_src-676bfd3221b2b70db1a278d5193760278b0219f9.tar.bz2 | |
Revert 120283 - net: Use ClosePlatformFile() instead of close/CloseHandle().
Review URL: http://codereview.chromium.org/9315062
TBR=satorux@chromium.org
We're guessing that this is causing timeouts on the Windows browser tests,
see http://build.chromium.org/p/chromium/builders/Win7%20Tests%20%28dbg%29%286%29/builds/2695/steps/browser_tests/logs/stdio
for example. :(
Review URL: https://chromiumcodereview.appspot.com/9307081
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120290 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/base/file_stream_posix.cc | 3 | ||||
| -rw-r--r-- | net/base/file_stream_win.cc | 3 | ||||
| -rw-r--r-- | net/url_request/url_request_file_job.cc | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/net/base/file_stream_posix.cc b/net/base/file_stream_posix.cc index a094eed..502d0f1 100644 --- a/net/base/file_stream_posix.cc +++ b/net/base/file_stream_posix.cc @@ -353,8 +353,9 @@ void FileStream::Close() { async_context_.reset(); if (file_ != base::kInvalidPlatformFileValue) { - if (!base::ClosePlatformFile(file_)) + if (close(file_) != 0) { NOTREACHED(); + } file_ = base::kInvalidPlatformFileValue; bound_net_log_.EndEvent(net::NetLog::TYPE_FILE_STREAM_OPEN, NULL); diff --git a/net/base/file_stream_win.cc b/net/base/file_stream_win.cc index 9e1f686f..1f7ecbf 100644 --- a/net/base/file_stream_win.cc +++ b/net/base/file_stream_win.cc @@ -181,8 +181,7 @@ void FileStream::Close() { async_context_.reset(); if (file_ != INVALID_HANDLE_VALUE) { - if (!base::ClosePlatformFile(file_)) - NOTREACHED(); + CloseHandle(file_); file_ = INVALID_HANDLE_VALUE; bound_net_log_.EndEvent(net::NetLog::TYPE_FILE_STREAM_OPEN, NULL); diff --git a/net/url_request/url_request_file_job.cc b/net/url_request/url_request_file_job.cc index 8f32750..d8187ab 100644 --- a/net/url_request/url_request_file_job.cc +++ b/net/url_request/url_request_file_job.cc @@ -158,9 +158,6 @@ void URLRequestFileJob::Start() { } void URLRequestFileJob::Kill() { - // URL requests should not block on the disk! - // http://code.google.com/p/chromium/issues/detail?id=59849 - base::ThreadRestrictions::ScopedAllowIO allow_io; stream_.Close(); if (async_resolver_) { |