Revert of Implement ScopedFD in terms of ScopedGeneric.

chrome/browser/process_singleton_mac_unittest.cc

 // Copyright (c) 2012 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 <errno.h>
 #include <fcntl.h>
 #include <sys/file.h>
 
 #include "chrome/browser/process_singleton.h"
 
 #include "base/file_util.h"
-#include "base/files/scoped_file.h"
 #include "base/path_service.h"
 #include "base/posix/eintr_wrapper.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/base/testing_profile.h"
 #include "testing/platform_test.h"
 
 namespace {
 
 class ProcessSingletonMacTest : public PlatformTest {
@@ skipping 10 matching lines @@
   virtual void TearDown() {
     PlatformTest::TearDown();
 
     // Verify that the lock was released.
     EXPECT_FALSE(IsLocked());
   }
 
   // Return |true| if the file exists and is locked.  Forces a failure
   // in the containing test in case of error condition.
   bool IsLocked() {
-    base::ScopedFD fd(HANDLE_EINTR(open(lock_path_.value().c_str(), O_RDONLY)));
-    if (!fd.is_valid()) {
+    int fd = HANDLE_EINTR(open(lock_path_.value().c_str(), O_RDONLY));
+    if (fd == -1) {
       EXPECT_EQ(ENOENT, errno) << "Unexpected error opening lockfile.";
       return false;
     }
 
-    int rc = HANDLE_EINTR(flock(fd.get(), LOCK_EX|LOCK_NB));
+    file_util::ScopedFD auto_close(&fd);
+
+    int rc = HANDLE_EINTR(flock(fd, LOCK_EX|LOCK_NB));
 
     // Got the lock, so it wasn't already locked.  Close releases.
     if (rc != -1)
       return false;
 
     // Someone else has the lock.
     if (errno == EWOULDBLOCK)
       return true;
 
     EXPECT_EQ(EWOULDBLOCK, errno) << "Unexpected error acquiring lock.";
@@ skipping 92 matching lines @@
   ps2.Cleanup();
   EXPECT_FALSE(IsLocked());
 }
 
 // TODO(shess): Test that the lock is released when the process dies.
 // DEATH_TEST?  I don't know.  If the code to communicate between
 // browser processes is ever written, this all would need to be tested
 // more like the other platforms, in which case it would be easy.
 
 }  // namespace