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

ceee/ie/plugin/bho/cookie_accountant.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.
 //
 // CookieAccountant implementation.
 #include "ceee/ie/plugin/bho/cookie_accountant.h"
 
 #include <atlbase.h>
 #include <wininet.h>
 
@@ skipping 26 matching lines @@
 CookieAccountant::~CookieAccountant() {
   if (internet_set_cookie_ex_a_patch_.is_patched())
     internet_set_cookie_ex_a_patch_.Unpatch();
   if (internet_set_cookie_ex_w_patch_.is_patched())
     internet_set_cookie_ex_w_patch_.Unpatch();
 }
 
 ProductionCookieAccountant::ProductionCookieAccountant() {
 }
 
+// static
+ProductionCookieAccountant* ProductionCookieAccountant::GetInstance() {
+  return Singleton<ProductionCookieAccountant>::get();
+}
+
 CookieAccountant* CookieAccountant::GetInstance() {
   // Unit tests can set singleton_instance_ directly.
   if (singleton_instance_ == NULL)
-    singleton_instance_ = ProductionCookieAccountant::get();
+    singleton_instance_ = ProductionCookieAccountant::GetInstance();
   return singleton_instance_;
 }
 
 DWORD WINAPI CookieAccountant::InternetSetCookieExAPatch(
     LPCSTR url, LPCSTR cookie_name, LPCSTR cookie_data,
     DWORD flags, DWORD_PTR reserved) {
   base::Time current_time = base::Time::Now();
   DWORD cookie_state = ::InternetSetCookieExA(url, cookie_name, cookie_data,
                                               flags, reserved);
   CookieAccountant::GetInstance()->RecordCookie(url, cookie_data,
@@ skipping 179 matching lines @@
         kInternetSetCookieExWFunctionName, InternetSetCookieExWPatch);
     DCHECK(error == NO_ERROR || !internet_set_cookie_ex_w_patch_.is_patched());
   }
   DCHECK(internet_set_cookie_ex_a_patch_.is_patched() ||
          internet_set_cookie_ex_w_patch_.is_patched());
   {
     AutoLock lock(lock_);
     patching_wininet_functions_ = false;
   }
 }