Revert "Disable the scoped handle verifier (and close hook) for M-39"

chrome/app/close_handle_hook_win.cc

 // Copyright 2014 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/close_handle_hook_win.h"
 
 #include <Windows.h>
 
 #include <vector>
 
@@ skipping 48 matching lines @@
 }
 
 void CloseHandleHooks::Unpatch() {
   for (std::vector<base::win::IATPatchFunction*>::iterator it = hooks_.begin();
        it != hooks_.end(); ++it) {
     (*it)->Unpatch();
   }
 }
 
 bool UseHooks() {
+  chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
+  if (channel == chrome::VersionInfo::CHANNEL_CANARY ||
+      channel == chrome::VersionInfo::CHANNEL_DEV) {
+    return true;
+  }
+
   return false;
 }
 
 base::string16 GetModuleName(HMODULE module) {
   base::string16 name;
   if (!module)
     return name;
   wchar_t buffer[MAX_PATH];
   int rv = GetModuleFileName(module, buffer, MAX_PATH);
   if (rv == MAX_PATH)
@@ skipping 24 matching lines @@
     hooks->AddIATPatch(L"chrome.exe");
     hooks->AddIATPatch(GetModuleName(GetChromeDLLModule()));
   } else {
     base::win::DisableHandleVerifier();
   }
 }
 
 void RemoveCloseHandleHooks() {
   g_hooks.Get().Unpatch();
 }