diff options
| author | mkwst@chromium.org <mkwst@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-02 08:36:19 +0000 |
|---|---|---|
| committer | mkwst@chromium.org <mkwst@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-02 08:36:19 +0000 |
| commit | b5088d08be50175ac759d868de91da16a634a323 (patch) | |
| tree | 22dd4f7940642a2807a70029a46dbb095390fec6 /net | |
| parent | ca7242018c7b7054520e41f985f0db0bf380668a (diff) | |
| download | chromium_src-b5088d08be50175ac759d868de91da16a634a323.zip chromium_src-b5088d08be50175ac759d868de91da16a634a323.tar.gz chromium_src-b5088d08be50175ac759d868de91da16a634a323.tar.bz2 | |
Revert 120174 - net: Use ClosePlatformFile() instead of close/CloseHandle().
ClosePlatformFile() is guarded with ThreadRestrictions::AssertIOAllowed()
that will catch bad pieces of code performing file IO on wrong threads.
BUG=72001
TEST=try bots
Review URL: http://codereview.chromium.org/9307040
TBR=satorux@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9309051
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120181 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/base/file_stream_posix.cc | 5 | ||||
| -rw-r--r-- | net/base/file_stream_win.cc | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/net/base/file_stream_posix.cc b/net/base/file_stream_posix.cc index d7608ac..50b1593 100644 --- a/net/base/file_stream_posix.cc +++ b/net/base/file_stream_posix.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -303,8 +303,9 @@ void FileStream::Close() { async_context_.reset(); if (file_ != base::kInvalidPlatformFileValue) { - if (!base::ClosePlatformFile(file_)) + if (close(file_) != 0) { NOTREACHED(); + } file_ = base::kInvalidPlatformFileValue; } } diff --git a/net/base/file_stream_win.cc b/net/base/file_stream_win.cc index 2c57f43b..07d365f 100644 --- a/net/base/file_stream_win.cc +++ b/net/base/file_stream_win.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -154,8 +154,7 @@ void FileStream::Close() { async_context_.reset(); if (file_ != INVALID_HANDLE_VALUE) { - if (!base::ClosePlatformFile(file_)) - NOTREACHED(); + CloseHandle(file_); file_ = INVALID_HANDLE_VALUE; } } |