3 files changed, 12 insertions, 8 deletions
diff --git a/ceee/common/process_utils_win.cc b/ceee/common/process_utils_win.cc
index 094af1e..80df821 100644
--- a/ceee/common/process_utils_win.cc
+++ b/ceee/common/process_utils_win.cc
@@ -130,6 +130,11 @@ ProcessCompatibilityCheck::ProcessCompatibilityCheck()
   StandardInitialize();
 }
 
+// static
+ProcessCompatibilityCheck* ProcessCompatibilityCheck::GetInstance() {
+  return Singleton<ProcessCompatibilityCheck>::get();
+}
+
 void ProcessCompatibilityCheck::StandardInitialize() {
   HRESULT hr = S_OK;
 
@@ -199,8 +204,7 @@ HRESULT ProcessCompatibilityCheck::IsCompatible(HWND process_window,
 
 HRESULT ProcessCompatibilityCheck::IsCompatible(DWORD process_id,
                                                 bool* is_compatible) {
-  ProcessCompatibilityCheck* instance
-      = Singleton<ProcessCompatibilityCheck>::get();
+  ProcessCompatibilityCheck* instance = GetInstance();
 
   DCHECK(instance != NULL);
   DCHECK(is_compatible != NULL);
@@ -306,7 +310,7 @@ void ProcessCompatibilityCheck::PatchState(
     CloseHandleFuncType close_handle_func,
     IsWOW64ProcessFuncType is_wow64_process_func) {
   PatchState(open_process_func, close_handle_func, is_wow64_process_func);
-  Singleton<ProcessCompatibilityCheck>::get()->KnownStateInitialize(
+  GetInstance()->KnownStateInitialize(
       system_type, current_process_wow64,
       check_integrity, current_process_integrity);
 }
@@ -324,7 +328,7 @@ void ProcessCompatibilityCheck::PatchState(
 
 void ProcessCompatibilityCheck::ResetState() {
   PatchState(OpenProcess, CloseHandle, IsWow64Process);
-  Singleton<ProcessCompatibilityCheck>::get()->StandardInitialize();
+  GetInstance()->StandardInitialize();
 }
 
 }  // namespace com
diff --git a/ceee/common/process_utils_win.h b/ceee/common/process_utils_win.h
index e928791..6b036a4 100644
--- a/ceee/common/process_utils_win.h
+++ b/ceee/common/process_utils_win.h
@@ -51,6 +51,8 @@ HRESULT IsCurrentProcessUacElevated(bool* running_as_admin);
 // with implementation.
 class ProcessCompatibilityCheck {
  public:
+  static ProcessCompatibilityCheck* GetInstance();
+
   // Is the process associated with the given window compatible with the
   // current process. If the call returns an error code, the value of
   // *is_compatible is undefined.
diff --git a/ceee/ie/broker/executors_manager.cc b/ceee/ie/broker/executors_manager.cc
index 4e2c32d..2256dbc 100644
--- a/ceee/ie/broker/executors_manager.cc
+++ b/ceee/ie/broker/executors_manager.cc
@@ -75,8 +75,7 @@ ExecutorsManager* ExecutorsManager::GetInstance() {
 }
 
 bool ExecutorsManager::IsKnownWindow(HWND window) {
-  return Singleton<ExecutorsManager, ExecutorsManager::SingletonTraits>::get()->
-      IsKnownWindowImpl(window);
+  return GetInstance()->IsKnownWindowImpl(window);
 }
 
 bool ExecutorsManager::IsKnownWindowImpl(HWND window) {
@@ -86,8 +85,7 @@ bool ExecutorsManager::IsKnownWindowImpl(HWND window) {
 }
 
 HWND ExecutorsManager::FindTabChild(HWND window) {
-  return Singleton<ExecutorsManager, ExecutorsManager::SingletonTraits>::get()->
-      FindTabChildImpl(window);
+  return GetInstance()->FindTabChildImpl(window);
 }
 
 HWND ExecutorsManager::FindTabChildImpl(HWND window) {