Cleanup in ProcessSingleton.

chrome_frame/buggy_bho_handling.cc

 // Copyright (c) 2011 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_frame/buggy_bho_handling.h"
 
 #include "base/logging.h"
+#include "base/process_util.h"
 #include "base/win/scoped_comptr.h"
 
 #include "chrome_frame/exception_barrier.h"
 #include "chrome_frame/function_stub.h"
 #include "chrome_frame/utils.h"
 #include "chrome_frame/vtable_patch_manager.h"
 
 namespace buggy_bho {
 
 base::ThreadLocalPointer<BuggyBhoTls> BuggyBhoTls::s_bad_object_tls_;
@@ skipping 130 matching lines @@
     }
   }
   patched_ = true;
   web_browser2_ = browser;
   return hr;
 }
 
 bool BuggyBhoTls::PatchIfBuggy(IUnknown* unk, const IID& diid) {
   DCHECK(unk);
   PROC* methods = *reinterpret_cast<PROC**>(unk);
-  HMODULE mod = GetModuleFromAddress(methods[0]);
+  HMODULE mod = base::GetModuleFromAddress(methods[0]);
   if (!IsBuggyBho(mod))
     return false;
 
   base::win::ScopedComPtr<IDispatch> disp;
   HRESULT hr = unk->QueryInterface(diid,
       reinterpret_cast<void**>(disp.Receive()));
   if (FAILED(hr))  // Sometimes only IDispatch QI is supported
     hr = disp.QueryFrom(unk);
   DCHECK(SUCCEEDED(hr));
 
@@ skipping 56 matching lines @@
     } else {
       PinModule();  // No backing out now.
       ::FlushInstructionCache(::GetCurrentProcess(), invoke, sizeof(PROC));
     }
   }
   ::VirtualProtect(invoke, sizeof(PROC), flags, &flags);
   return hr;
 }
 
 }  // end namespace buggy_bho