OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
| 5 #include "base/files/file.h" |
5 #include "base/logging.h" | 6 #include "base/logging.h" |
6 #include "base/platform_file.h" | |
7 #include "dbus/file_descriptor.h" | 7 #include "dbus/file_descriptor.h" |
8 | 8 |
9 namespace dbus { | 9 namespace dbus { |
10 | 10 |
11 FileDescriptor::~FileDescriptor() { | 11 FileDescriptor::~FileDescriptor() { |
12 if (owner_) | 12 if (owner_) |
13 base::ClosePlatformFile(value_); | 13 base::File auto_closer(value_); |
14 } | 14 } |
15 | 15 |
16 int FileDescriptor::value() const { | 16 int FileDescriptor::value() const { |
17 CHECK(valid_); | 17 CHECK(valid_); |
18 return value_; | 18 return value_; |
19 } | 19 } |
20 | 20 |
21 int FileDescriptor::TakeValue() { | 21 int FileDescriptor::TakeValue() { |
22 CHECK(valid_); // NB: check first so owner_ is unchanged if this triggers | 22 CHECK(valid_); // NB: check first so owner_ is unchanged if this triggers |
23 owner_ = false; | 23 owner_ = false; |
24 return value_; | 24 return value_; |
25 } | 25 } |
26 | 26 |
27 void FileDescriptor::CheckValidity() { | 27 void FileDescriptor::CheckValidity() { |
28 base::PlatformFileInfo info; | 28 base::File file(value_); |
29 bool ok = base::GetPlatformFileInfo(value_, &info); | 29 base::File::Info info; |
| 30 bool ok = file.GetInfo(&info); |
| 31 file.TakePlatformFile(); // Prevent |value_| from being closed by |file|. |
30 valid_ = (ok && !info.is_directory); | 32 valid_ = (ok && !info.is_directory); |
31 } | 33 } |
32 | 34 |
33 } // namespace dbus | 35 } // namespace dbus |
OLD | NEW |