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

base/win/scoped_handle_test_dll.cc

 // Copyright 2016 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 <windows.h>
 
 #include <vector>
 
-#include "base/win/base_features.h"
 #include "base/win/current_module.h"
 #include "base/win/scoped_handle.h"
 
 namespace base {
 namespace win {
 namespace testing {
 
 extern "C" bool __declspec(dllexport) RunTest();
 
 namespace {
@@ skipping 73 matching lines @@
   if (!verifier_module)
     return false;
 
   // Get my module
   HMODULE my_module = CURRENT_MODULE();
   if (!my_module)
     return false;
 
   HMODULE main_module = ::GetModuleHandle(NULL);
 
-#if BUILDFLAG(SINGLE_MODULE_MODE_HANDLE_VERIFIER)
+#if defined(COMPONENT_BUILD)
   // In a component build ActiveVerifier will always be created inside base.dll
   // as the code always lives there.
   if (verifier_module == my_module || verifier_module == main_module)
     return false;
 #else
   // In a non-component build, ActiveVerifier should always be created in the
   // version of base linked with the main executable.
   if (verifier_module == my_module || verifier_module != main_module)
     return false;
 #endif
   return true;
 }
 
 }  // namespace
 
 bool RunTest() {
   return InternalRunThreadTest() && InternalRunLocationTest();
 }
 
 }  // testing
 }  // win
 }  // base