Rename all methods accessing Singleton<T> as GetInstance().

This is in preparation to a subsequent CL where Singleton<T> will restrict access to only the type being made singleton.

I also moved pepper::ResourceTracker to a lazy instance since there were too many places in code where this class was being accessed from and this was a smaller change than renaming methods in that case.

BUG=65298
TEST=all existing tests should pass.

Review URL: http://codereview.chromium.org/5685007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68982 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 3 deletions

diff --git a/chrome_frame/chrome_frame_activex.cc b/chrome_frame/chrome_frame_activex.cc
index 7d3f5eb..286f351 100644
--- a/chrome_frame/chrome_frame_activex.cc
+++ b/chrome_frame/chrome_frame_activex.cc
@@ -37,7 +37,7 @@ class TopLevelWindowMapping {
  public:
   typedef std::vector<HWND> WindowList;
 
-  static TopLevelWindowMapping* instance() {
+  static TopLevelWindowMapping* GetInstance() {
     return Singleton<TopLevelWindowMapping>::get();
   }
 
@@ -83,7 +83,7 @@ LRESULT CALLBACK TopWindowProc(int code, WPARAM wparam, LPARAM lparam) {
     case WM_MOVE:
     case WM_MOVING: {
       TopLevelWindowMapping::WindowList cf_instances =
-          TopLevelWindowMapping::instance()->GetInstances(message_hwnd);
+          TopLevelWindowMapping::GetInstance()->GetInstances(message_hwnd);
       TopLevelWindowMapping::WindowList::iterator
           iter(cf_instances.begin()), end(cf_instances.end());
       for (;iter != end; ++iter) {
@@ -646,7 +646,7 @@ HRESULT ChromeFrameActivex::InstallTopLevelHook(IOleClientSite* client_site) {
   HWND top_window = ::GetAncestor(parent_wnd, GA_ROOT);
   chrome_wndproc_hook_ = InstallLocalWindowHook(top_window);
   if (chrome_wndproc_hook_)
-    TopLevelWindowMapping::instance()->AddMapping(top_window, m_hWnd);
+    TopLevelWindowMapping::GetInstance()->AddMapping(top_window, m_hWnd);
 
   return chrome_wndproc_hook_ ? S_OK : E_FAIL;
 }