Add a new GetInstance() method for singleton classes, take 2.

chrome_frame/chrome_tab.cc

 // Copyright (c) 2010 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.
 
 // chrome_tab.cc : Implementation of DLL Exports.
 
 // Include without path to make GYP build see it.
 #include "chrome_tab.h"  // NOLINT
 
 #include <atlsecurity.h>
@@ skipping 194 matching lines @@
                                         ATLTRACESTATUS_DISABLED);
 #endif
     InitGoogleUrl();
 
     g_exit_manager = new base::AtExitManager();
     CommandLine::Init(0, NULL);
     InitializeCrashReporting();
     logging::InitLogging(NULL, logging::LOG_ONLY_TO_SYSTEM_DEBUG_LOG,
                         logging::LOCK_LOG_FILE, logging::DELETE_OLD_LOG_FILE);
 
-    DllRedirector* dll_redirector = Singleton<DllRedirector>::get();
+    DllRedirector* dll_redirector = DllRedirector::GetInstance();
     DCHECK(dll_redirector);
 
     if (!dll_redirector->RegisterAsFirstCFModule()) {
       // Someone else was here first, try and get a pointer to their
       // DllGetClassObject export:
       g_dll_get_class_object_redir_ptr =
           dll_redirector->GetDllGetClassObjectPtr();
       DCHECK(g_dll_get_class_object_redir_ptr != NULL)
           << "Found CF module with no DllGetClassObject export.";
     }
 
     // Enable ETW logging.
     logging::LogEventProvider::Initialize(kChromeFrameProvider);
   } else if (reason == DLL_PROCESS_DETACH) {
-    DllRedirector* dll_redirector = Singleton<DllRedirector>::get();
+    DllRedirector* dll_redirector = DllRedirector::GetInstance();
     DCHECK(dll_redirector);
 
     dll_redirector->UnregisterAsFirstCFModule();
     g_patch_helper.UnpatchIfNeeded();
     delete g_exit_manager;
     g_exit_manager = NULL;
     ShutdownCrashReporting();
   }
   return _AtlModule.DllMain(reason, reserved);
 }
@@ skipping 507 matching lines @@
     sd.GetDacl(&new_dacl);
     new_dacl.AddAllowedAce(token_.GetUser(), GENERIC_WRITE | GENERIC_READ);
     if (AtlSetDacl(object_name.c_str(), SE_REGISTRY_KEY, new_dacl)) {
       result = SetOrDeleteMimeHandlerKey(enable, HKEY_LOCAL_MACHINE);
     }
   }
 
   backup.RestoreSecurity(object_name.c_str());
   return result;
 }