Revert of Improve the ScopedHandle verifier.

base/win/scoped_handle.h

 // 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.
 
 #ifndef BASE_WIN_SCOPED_HANDLE_H_
 #define BASE_WIN_SCOPED_HANDLE_H_
 
 #include <windows.h>
 
 #include "base/base_export.h"
@@ skipping 83 matching lines @@
     }
     return temp;
   }
 
   // Explicitly closes the owned handle.
   void Close() {
     if (Traits::IsHandleValid(handle_)) {
       Verifier::StopTracking(handle_, this, BASE_WIN_GET_CALLER,
                              tracked_objects::GetProgramCounter());
 
-      Traits::CloseHandle(handle_);
+      if (!Traits::CloseHandle(handle_))
+        CHECK(false);
+
       handle_ = Traits::NullHandle();
     }
   }
 
  private:
   Handle handle_;
 };
 
 #undef BASE_WIN_GET_CALLER
 
 // The traits class for Win32 handles that can be closed via CloseHandle() API.
 class HandleTraits {
  public:
   typedef HANDLE Handle;
 
   // Closes the handle.
-  static bool BASE_EXPORT CloseHandle(HANDLE handle);
+  static bool CloseHandle(HANDLE handle) {
+    return ::CloseHandle(handle) != FALSE;
+  }
 
   // Returns true if the handle value is valid.
   static bool IsHandleValid(HANDLE handle) {
     return handle != NULL && handle != INVALID_HANDLE_VALUE;
   }
 
   // Returns NULL handle value.
   static HANDLE NullHandle() {
     return NULL;
   }
@@ skipping 25 matching lines @@
                             const void* pc1, const void* pc2);
   static void StopTracking(HANDLE handle, const void* owner,
                            const void* pc1, const void* pc2);
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(VerifierTraits);
 };
 
 typedef GenericScopedHandle<HandleTraits, VerifierTraits> ScopedHandle;
 
-// This function should be called by the embedder to enable the use of
-// VerifierTraits at runtime. It has no effect if DummyVerifierTraits is used
-// for ScopedHandle.
-void BASE_EXPORT EnableHandleVerifier();
-
-// This should be called whenever the OS is closing a handle, if extended
-// verification of improper handle closing is desired. If |handle| is being
-// tracked by the handle verifier and ScopedHandle is not the one closing it,
-// a CHECK is generated.
-void BASE_EXPORT OnHandleBeingClosed(HANDLE handle);
-
 }  // namespace win
 }  // namespace base
 
 #endif  // BASE_SCOPED_HANDLE_WIN_H_