Remove some LazyInstance use in base/

base/debug/close_handle_hook_win.cc

 // Copyright 2015 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/debug/close_handle_hook_win.h"
 
 #include <Windows.h>
 #include <psapi.h>
 #include <stddef.h>
 
 #include <algorithm>
 #include <memory>
 #include <vector>
 
-#include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "base/win/iat_patch_function.h"
 #include "base/win/pe_image.h"
 #include "base/win/scoped_handle.h"
 #include "build/build_config.h"
 
 namespace {
 
 typedef BOOL (WINAPI* CloseHandleType) (HANDLE handle);
 
@@ skipping 170 matching lines @@
   ~HandleHooks() {}
 
   void AddIATPatch(HMODULE module);
   void AddEATPatch();
   void Unpatch();
 
  private:
   std::vector<base::win::IATPatchFunction*> hooks_;
   DISALLOW_COPY_AND_ASSIGN(HandleHooks);
 };
-base::LazyInstance<HandleHooks> g_hooks = LAZY_INSTANCE_INITIALIZER;

[Mark Mentovai, 2017/01/31 14:37:01]

This one wasn’t “leaky”, but I think that was an omission.

[scottmg, 2017/01/31 18:19:16]

Yes, I thought it was accidental too. I just now removed RemoveHandleHooks()
which was empty and used only in one location in any case, as that would
conceivably have been a location where HandleHooks might have been cleaned up.

 
 void HandleHooks::AddIATPatch(HMODULE module) {
   if (!module)
     return;
 
   base::win::IATPatchFunction* patch = NULL;
   patch = IATPatch(module, "CloseHandle", &CloseHandleHook,
                    reinterpret_cast<void**>(&g_close_function));
   if (!patch)
     return;
@@ skipping 35 matching lines @@
   returned = std::min(kSize, returned);
 
   for (DWORD current = 0; current < returned; current++) {
     hooks->AddIATPatch(modules[current]);
   }
 }
 
 }  // namespace
 
 void InstallHandleHooks() {
-  HandleHooks* hooks = g_hooks.Pointer();
+  static HandleHooks* hooks = new HandleHooks();
 
   // Performing EAT interception first is safer in the presence of other
   // threads attempting to call CloseHandle.
   hooks->AddEATPatch();
   PatchLoadedModules(hooks);
 }
 
 void RemoveHandleHooks() {
   // We are partching all loaded modules without forcing them to stay in memory,
   // removing patches is not safe.
 }
 
 }  // namespace debug
 }  // namespace base