Revert of Add a buildflag to use the handle verifier in a per module mode.

base/win/scoped_handle.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 "base/win/scoped_handle.h"
 
 #include <stddef.h>
 
 #include <unordered_map>
 
 #include "base/debug/alias.h"
 #include "base/debug/stack_trace.h"
 #include "base/hash.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/synchronization/lock_impl.h"
 #include "base/threading/thread_local.h"
-#include "base/win/base_features.h"
 #include "base/win/current_module.h"
 
 extern "C" {
 __declspec(dllexport) void* GetHandleVerifier();
 typedef void* (*GetHandleVerifierFn)();
 }
 
 namespace {
 
 struct HandleHash {
@@ skipping 95 matching lines @@
   // Another thread in this module might be trying to assign the global
   // verifier, so check that within the lock here.
   if (g_active_verifier)
     return;
   g_active_verifier =
       existing_verifier ? existing_verifier : new ActiveVerifier(enabled);
 }
 
 // static
 void ActiveVerifier::InstallVerifier() {
-#if BUILDFLAG(SINGLE_MODULE_MODE_HANDLE_VERIFIER)
+#if defined(COMPONENT_BUILD)
   // Component build has one Active Verifier per module.
   ThreadSafeAssignOrCreateActiveVerifier(nullptr, true);
 #else
   // If you are reading this, wondering why your process seems deadlocked, take
   // a look at your DllMain code and remove things that should not be done
   // there, like doing whatever gave you that nice windows handle you are trying
   // to store in a ScopedHandle.
   HMODULE main_module = ::GetModuleHandle(NULL);
   GetHandleVerifierFn get_handle_verifier =
       reinterpret_cast<GetHandleVerifierFn>(::GetProcAddress(
@@ skipping 136 matching lines @@
 void OnHandleBeingClosed(HANDLE handle) {
   return ActiveVerifier::Get()->OnHandleBeingClosed(handle);
 }
 
 HMODULE GetHandleVerifierModuleForTesting() {
   return g_active_verifier->GetModule();
 }
 
 }  // namespace win
 }  // namespace base