1 files changed, 10 insertions, 11 deletions
diff --git a/chrome/browser/chromeos/system/automatic_reboot_manager.cc b/chrome/browser/chromeos/system/automatic_reboot_manager.cc
index 2ca1409..1e00316 100644
--- a/chrome/browser/chromeos/system/automatic_reboot_manager.cc
+++ b/chrome/browser/chromeos/system/automatic_reboot_manager.cc
@@ -18,7 +18,6 @@
 #include "base/callback.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
-#include "base/files/scoped_file.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
@@ -57,15 +56,15 @@ const int kOneKilobyte = 1 << 10;                  // 1 kB in bytes.
 
 base::TimeDelta ReadTimeDeltaFromFile(const base::FilePath& path) {
   base::ThreadRestrictions::AssertIOAllowed();
-  base::ScopedFD fd(
-      HANDLE_EINTR(open(path.value().c_str(), O_RDONLY | O_NOFOLLOW)));
-  if (!fd.is_valid())
+  int fd = HANDLE_EINTR(open(path.value().c_str(), O_RDONLY | O_NOFOLLOW));
+  if (fd < 0)
     return base::TimeDelta();
+  file_util::ScopedFD fd_closer(&fd);
 
   std::string contents;
   char buffer[kOneKilobyte];
   ssize_t length;
-  while ((length = read(fd.get(), buffer, sizeof(buffer))) > 0)
+  while ((length = read(fd, buffer, sizeof(buffer))) > 0)
     contents.append(buffer, length);
 
   double seconds;
@@ -109,16 +108,16 @@ void SaveUpdateRebootNeededUptime() {
   if (uptime == kZeroTimeDelta)
     return;
 
-  base::ScopedFD fd(HANDLE_EINTR(
-      open(update_reboot_needed_uptime_file.value().c_str(),
-           O_CREAT | O_WRONLY | O_TRUNC | O_NOFOLLOW,
-           0666)));
-  if (!fd.is_valid())
+  int fd = HANDLE_EINTR(open(update_reboot_needed_uptime_file.value().c_str(),
+                             O_CREAT | O_WRONLY | O_TRUNC | O_NOFOLLOW,
+                             0666));
+  if (fd < 0)
     return;
+  file_util::ScopedFD fd_closer(&fd);
 
   std::string update_reboot_needed_uptime =
       base::DoubleToString(uptime.InSecondsF());
-  base::WriteFileDescriptor(fd.get(), update_reboot_needed_uptime.c_str(),
+  base::WriteFileDescriptor(fd, update_reboot_needed_uptime.c_str(),
                             update_reboot_needed_uptime.size());
 }