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

rvargas · rvargas · commit c8d875133998 · 2014-09-30T17:36:13.000Z
To be merged on 2171. BUG=418816 R=cpu@chromium.org TBR=cpu@chromium.org Review URL: https://codereview.chromium.org/616713002 Cr-Commit-Position: refs/heads/master@{#297319} (cherry picked from commit 20d9928) Review URL: https://codereview.chromium.org/618543002 Cr-Commit-Position: refs/branch-heads/2171@{#4} Cr-Branched-From: 267aeeb-refs/heads/master@{#297060}
diff --git a/chrome/app/close_handle_hook_win.cc b/chrome/app/close_handle_hook_win.cc
@@ -66,12 +66,6 @@ void CloseHandleHooks::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;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -66,12 +66,6 @@ void CloseHandleHooks::Unpatch() {`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`bool UseHooks() {`
`69`		`- chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();`
`70`		`- if (channel == chrome::VersionInfo::CHANNEL_CANARY \|\|`
`71`		`- channel == chrome::VersionInfo::CHANNEL_DEV) {`
`72`		`- return true;`
`73`		`- }`
`74`		`-`
`75`	`69`	`return false;`
`76`	`70`	`}`
`77`	`71`