Revert Active Verifier tests

chrome/app/chrome_main_delegate.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 "chrome/app/chrome_main_delegate.h"
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
 #include "base/cpu.h"
 #include "base/files/file_path.h"
@@ skipping 37 matching lines @@
 #include "content/public/common/content_paths.h"
 #include "content/public/common/content_switches.h"
 #include "extensions/common/constants.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_switches.h"
 
 #if defined(OS_WIN)
 #include <atlbase.h>
 #include <malloc.h>
 #include <algorithm>
-#include "base/debug/close_handle_hook_win.h"
+#include "chrome/app/close_handle_hook_win.h"
 #include "chrome/common/child_process_logging.h"
 #include "chrome/common/v8_breakpad_support_win.h"
 #include "components/crash/content/app/crashpad.h"
 #include "sandbox/win/src/sandbox.h"
 #include "ui/base/resource/resource_bundle_win.h"
 #endif
 
 #if defined(OS_MACOSX)
 #include "base/mac/foundation_util.h"
 #include "chrome/app/chrome_main_mac.h"
@@ skipping 423 matching lines @@
 #endif
 #endif  // OS_POSIX
 
 #if defined(OS_WIN)
   // Must do this before any other usage of command line!
   if (HasDeprecatedArguments(command_line.GetCommandLineString())) {
     *exit_code = 1;
     return true;
   }
 
-  // Handle verifier is enabled on 32-bit only, and only in Debug builds or
-  // Release builds running on Dev or Canary channels.
-  bool handle_verifier_enabled = false;
-#if !defined(ARCH_CPU_X86_64)
-#if defined(NDEBUG)
-  version_info::Channel channel = chrome::GetChannel();
-  if (channel == version_info::Channel::CANARY ||
-      channel == version_info::Channel::DEV) {
-    handle_verifier_enabled = true;
-  }
-#else
-  // Always enabled in Debug.
-  handle_verifier_enabled = true;
-#endif  // NDEBUG
-#endif  // ARCH_CPU_X86_64
-
-  if (!handle_verifier_enabled || !base::debug::InstallHandleHooks())
-    base::win::DisableHandleVerifier();
-#endif  // OS_WIN
+  InstallHandleHooks();
+#endif
 
   chrome::RegisterPathProvider();
 #if defined(OS_CHROMEOS)
   chromeos::RegisterPathProvider();
 #endif
 #if !defined(DISABLE_NACL) && defined(OS_LINUX)
   nacl::RegisterPathProvider();
 #endif
 
   ContentSettingsPattern::SetNonWildcardDomainNonPortScheme(
@@ skipping 368 matching lines @@
   if (SubprocessNeedsResourceBundle(process_type))
     ResourceBundle::CleanupSharedInstance();
 #if !defined(OS_ANDROID)
   logging::CleanupChromeLogging();
 #else
   // Android doesn't use InitChromeLogging, so we close the log file manually.
   logging::CloseLogFile();
 #endif  // !defined(OS_ANDROID)
 
 #if defined(OS_WIN)
-  base::debug::RemoveHandleHooks();
+  RemoveHandleHooks();
 #endif
 }
 
 #if defined(OS_MACOSX)
 bool ChromeMainDelegate::ProcessRegistersWithSystemProcess(
     const std::string& process_type) {
 #if defined(DISABLE_NACL)
   return false;
 #else
   return process_type == switches::kNaClLoaderProcess;
@@ skipping 85 matching lines @@
     case version_info::Channel::CANARY:
       return true;
     case version_info::Channel::DEV:
     case version_info::Channel::BETA:
     case version_info::Channel::STABLE:
     default:
       // Don't enable instrumentation.
       return false;
   }
 }