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

5 files changed, 9 insertions, 9 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;
 }
diff --git a/chrome_frame/chrome_frame_activex_base.h b/chrome_frame/chrome_frame_activex_base.h
index c7dd5cf..811c314 100644
--- a/chrome_frame/chrome_frame_activex_base.h
+++ b/chrome_frame/chrome_frame_activex_base.h
@@ -253,7 +253,7 @@ END_MSG_MAP()
 
   void SetResourceModule() {
     DCHECK(NULL == prev_resource_instance_);
-    SimpleResourceLoader* loader_instance = SimpleResourceLoader::instance();
+    SimpleResourceLoader* loader_instance = SimpleResourceLoader::GetInstance();
     DCHECK(loader_instance);
     HMODULE res_dll = loader_instance->GetResourceModuleHandle();
     _AtlBaseModule.SetResourceInstance(res_dll);
diff --git a/chrome_frame/simple_resource_loader.cc b/chrome_frame/simple_resource_loader.cc
index 324c5ca..ce6407b 100644
--- a/chrome_frame/simple_resource_loader.cc
+++ b/chrome_frame/simple_resource_loader.cc
@@ -116,7 +116,7 @@ SimpleResourceLoader::~SimpleResourceLoader() {
 }
 
 // static
-SimpleResourceLoader* SimpleResourceLoader::instance() {
+SimpleResourceLoader* SimpleResourceLoader::GetInstance() {
   return Singleton<SimpleResourceLoader>::get();
 }
 
@@ -240,12 +240,12 @@ std::wstring SimpleResourceLoader::GetLocalizedResource(int message_id) {
 
 // static
 std::wstring SimpleResourceLoader::GetLanguage() {
-  return SimpleResourceLoader::instance()->language_;
+  return SimpleResourceLoader::GetInstance()->language_;
 }
 
 // static
 std::wstring SimpleResourceLoader::Get(int message_id) {
-  SimpleResourceLoader* loader = SimpleResourceLoader::instance();
+  SimpleResourceLoader* loader = SimpleResourceLoader::GetInstance();
   return loader->GetLocalizedResource(message_id);
 }
 
diff --git a/chrome_frame/simple_resource_loader.h b/chrome_frame/simple_resource_loader.h
index 45d03ed..505c0cb 100644
--- a/chrome_frame/simple_resource_loader.h
+++ b/chrome_frame/simple_resource_loader.h
@@ -21,7 +21,7 @@
 class SimpleResourceLoader {
  public:
 
-  static SimpleResourceLoader* instance();
+  static SimpleResourceLoader* GetInstance();
 
   // Returns the language tag for the active language.
   static std::wstring GetLanguage();
diff --git a/chrome_frame/test/simple_resource_loader_test.cc b/chrome_frame/test/simple_resource_loader_test.cc
index 9b67a6e..98729f3 100644
--- a/chrome_frame/test/simple_resource_loader_test.cc
+++ b/chrome_frame/test/simple_resource_loader_test.cc
@@ -57,7 +57,7 @@ TEST(SimpleResourceLoaderTest, LoadLocaleDll) {
 }
 
 TEST(SimpleResourceLoaderTest, InstanceTest) {
-  SimpleResourceLoader* loader = SimpleResourceLoader::instance();
+  SimpleResourceLoader* loader = SimpleResourceLoader::GetInstance();
 
   ASSERT_TRUE(NULL != loader);
   ASSERT_TRUE(NULL != loader->GetResourceModuleHandle());