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

ceee/ie/plugin/bho/webrequest_notifier.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.
 //
 // Web request notifier implementation.
 #include "ceee/ie/plugin/bho/webrequest_notifier.h"
 
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "chrome_frame/function_stub.h"
@@ skipping 144 matching lines @@
   DWORD error = patch_function->Patch(kUrlMonModuleName, kWinINetModuleName,
                                       name, handler);
   // The patching operation is either successful, or failed cleanly.
   DCHECK(error == NO_ERROR || !patch_function->is_patched());
 }
 
 INTERNET_STATUS_CALLBACK STDAPICALLTYPE
     WebRequestNotifier::InternetSetStatusCallbackAPatch(
         HINTERNET internet,
         INTERNET_STATUS_CALLBACK callback) {
-  WebRequestNotifier* instance = ProductionWebRequestNotifier::get();
+  WebRequestNotifier* instance = ProductionWebRequestNotifier::GetInstance();
   INTERNET_STATUS_CALLBACK new_callback =
       instance->HandleBeforeInternetSetStatusCallback(internet, callback);
   return ::InternetSetStatusCallbackA(internet, new_callback);
 }
 
 INTERNET_STATUS_CALLBACK STDAPICALLTYPE
     WebRequestNotifier::InternetSetStatusCallbackWPatch(
         HINTERNET internet,
         INTERNET_STATUS_CALLBACK callback) {
-  WebRequestNotifier* instance = ProductionWebRequestNotifier::get();
+  WebRequestNotifier* instance = ProductionWebRequestNotifier::GetInstance();
   INTERNET_STATUS_CALLBACK new_callback =
       instance->HandleBeforeInternetSetStatusCallback(internet, callback);
   return ::InternetSetStatusCallbackW(internet, new_callback);
 }
 
 HINTERNET STDAPICALLTYPE WebRequestNotifier::InternetConnectAPatch(
     HINTERNET internet,
     LPCSTR server_name,
     INTERNET_PORT server_port,
     LPCSTR user_name,
     LPCSTR password,
     DWORD service,
     DWORD flags,
     DWORD_PTR context) {
-  WebRequestNotifier* instance = ProductionWebRequestNotifier::get();
+  WebRequestNotifier* instance = ProductionWebRequestNotifier::GetInstance();
   instance->HandleBeforeInternetConnect(internet);
 
   HINTERNET server = ::InternetConnectA(internet, server_name, server_port,
                                         user_name, password, service, flags,
                                         context);
 
   instance->HandleAfterInternetConnect(server, CA2W(server_name), server_port,
                                        service);
   return server;
 }
 
 HINTERNET STDAPICALLTYPE WebRequestNotifier::InternetConnectWPatch(
     HINTERNET internet,
     LPCWSTR server_name,
     INTERNET_PORT server_port,
     LPCWSTR user_name,
     LPCWSTR password,
     DWORD service,
     DWORD flags,
     DWORD_PTR context) {
-  WebRequestNotifier* instance = ProductionWebRequestNotifier::get();
+  WebRequestNotifier* instance = ProductionWebRequestNotifier::GetInstance();
   instance->HandleBeforeInternetConnect(internet);
 
   HINTERNET server = ::InternetConnectW(internet, server_name, server_port,
                                         user_name, password, service, flags,
                                         context);
 
   instance->HandleAfterInternetConnect(server, server_name, server_port,
                                        service);
   return server;
 }
 
 HINTERNET STDAPICALLTYPE WebRequestNotifier::HttpOpenRequestAPatch(
     HINTERNET connect,
     LPCSTR verb,
     LPCSTR object_name,
     LPCSTR version,
     LPCSTR referrer,
     LPCSTR* accept_types,
     DWORD flags,
     DWORD_PTR context) {
   HINTERNET request = ::HttpOpenRequestA(connect, verb, object_name, version,
                                          referrer, accept_types, flags,
                                          context);
 
-  WebRequestNotifier* instance = ProductionWebRequestNotifier::get();
+  WebRequestNotifier* instance = ProductionWebRequestNotifier::GetInstance();
   instance->HandleAfterHttpOpenRequest(connect, request, verb,
                                        CA2W(object_name), flags);
   return request;
 }
 
 HINTERNET STDAPICALLTYPE WebRequestNotifier::HttpOpenRequestWPatch(
     HINTERNET connect,
     LPCWSTR verb,
     LPCWSTR object_name,
     LPCWSTR version,
     LPCWSTR referrer,
     LPCWSTR* accept_types,
     DWORD flags,
     DWORD_PTR context) {
   HINTERNET request = ::HttpOpenRequestW(connect, verb, object_name, version,
                                          referrer, accept_types, flags,
                                          context);
 
-  WebRequestNotifier* instance = ProductionWebRequestNotifier::get();
+  WebRequestNotifier* instance = ProductionWebRequestNotifier::GetInstance();
   instance->HandleAfterHttpOpenRequest(connect, request, CW2A(verb),
                                        object_name, flags);
   return request;
 }
 
 BOOL STDAPICALLTYPE WebRequestNotifier::HttpSendRequestAPatch(
     HINTERNET request,
     LPCSTR headers,
     DWORD headers_length,
     LPVOID optional,
     DWORD optional_length) {
-  WebRequestNotifier* instance = ProductionWebRequestNotifier::get();
+  WebRequestNotifier* instance = ProductionWebRequestNotifier::GetInstance();
   instance->HandleBeforeHttpSendRequest(request);
   return ::HttpSendRequestA(request, headers, headers_length, optional,
                             optional_length);
 }
 
 BOOL STDAPICALLTYPE WebRequestNotifier::HttpSendRequestWPatch(
     HINTERNET request,
     LPCWSTR headers,
     DWORD headers_length,
     LPVOID optional,
     DWORD optional_length) {
-  WebRequestNotifier* instance = ProductionWebRequestNotifier::get();
+  WebRequestNotifier* instance = ProductionWebRequestNotifier::GetInstance();
   instance->HandleBeforeHttpSendRequest(request);
   return ::HttpSendRequestW(request, headers, headers_length, optional,
                             optional_length);
 }
 
 void CALLBACK WebRequestNotifier::InternetStatusCallbackPatch(
     INTERNET_STATUS_CALLBACK original,
     HINTERNET internet,
     DWORD_PTR context,
     DWORD internet_status,
     LPVOID status_information,
     DWORD status_information_length) {
-  WebRequestNotifier* instance = ProductionWebRequestNotifier::get();
+  WebRequestNotifier* instance = ProductionWebRequestNotifier::GetInstance();
   instance->HandleBeforeInternetStatusCallback(original, internet, context,
                                                internet_status,
                                                status_information,
                                                status_information_length);
   original(internet, context, internet_status, status_information,
            status_information_length);
 }
 
 BOOL STDAPICALLTYPE WebRequestNotifier::InternetReadFilePatch(
     HINTERNET file,
     LPVOID buffer,
     DWORD number_of_bytes_to_read,
     LPDWORD number_of_bytes_read) {
   BOOL result = ::InternetReadFile(file, buffer, number_of_bytes_to_read,
                                    number_of_bytes_read);
-  WebRequestNotifier* instance = ProductionWebRequestNotifier::get();
+  WebRequestNotifier* instance = ProductionWebRequestNotifier::GetInstance();
   instance->HandleAfterInternetReadFile(file, result, number_of_bytes_read);
 
   return result;
 }
 
 INTERNET_STATUS_CALLBACK
     WebRequestNotifier::HandleBeforeInternetSetStatusCallback(
         HINTERNET internet,
         INTERNET_STATUS_CALLBACK internet_callback) {
   CComCritSecLock<CComAutoCriticalSection> lock(critical_section_);
@@ skipping 487 matching lines @@
       NOTREACHED();
       break;
   }
 
   if (fire_on_error_occurred) {
     webrequest_events_funnel().OnErrorOccurred(
         info->id, info->url.c_str(), L"", base::Time::Now());
   }
   info->state = next_state;
 }
+
+// static
+ProductionWebRequestNotifier* ProductionWebRequestNotifier::GetInstance() {
+  return Singleton<ProductionWebRequestNotifier>::get();
+}