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

3 files changed, 7 insertions, 7 deletions

diff --git a/chrome/browser/service/service_process_control_browsertest.cc b/chrome/browser/service/service_process_control_browsertest.cc
index ca47f9e..8cf596c 100644
--- a/chrome/browser/service/service_process_control_browsertest.cc
+++ b/chrome/browser/service/service_process_control_browsertest.cc
@@ -23,13 +23,13 @@ class ServiceProcessControlBrowserTest
     base::CloseProcessHandle(service_process_handle_);
     service_process_handle_ = base::kNullProcessHandle;
     // Delete all instances of ServiceProcessControl.
-    ServiceProcessControlManager::instance()->Shutdown();
+    ServiceProcessControlManager::GetInstance()->Shutdown();
   }
 
  protected:
   void LaunchServiceProcessControl() {
     ServiceProcessControl* process =
-        ServiceProcessControlManager::instance()->GetProcessControl(
+        ServiceProcessControlManager::GetInstance()->GetProcessControl(
             browser()->profile());
     process_ = process;
 
@@ -55,7 +55,7 @@ class ServiceProcessControlBrowserTest
   void Disconnect() {
     // This will delete all instances of ServiceProcessControl and close the IPC
     // connections.
-    ServiceProcessControlManager::instance()->Shutdown();
+    ServiceProcessControlManager::GetInstance()->Shutdown();
     process_ = NULL;
   }
 
@@ -140,7 +140,7 @@ static void DecrementUntilZero(int* count) {
 // get invoked.
 IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest, MultipleLaunchTasks) {
   ServiceProcessControl* process =
-      ServiceProcessControlManager::instance()->GetProcessControl(
+      ServiceProcessControlManager::GetInstance()->GetProcessControl(
           browser()->profile());
   int launch_count = 5;
   for (int i = 0; i < launch_count; i++) {
@@ -159,7 +159,7 @@ IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest, MultipleLaunchTasks) {
 // Make sure using the same task for success and failure tasks works.
 IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest, SameLaunchTask) {
   ServiceProcessControl* process =
-      ServiceProcessControlManager::instance()->GetProcessControl(
+      ServiceProcessControlManager::GetInstance()->GetProcessControl(
           browser()->profile());
   int launch_count = 5;
   for (int i = 0; i < launch_count; i++) {
diff --git a/chrome/browser/service/service_process_control_manager.cc b/chrome/browser/service/service_process_control_manager.cc
index bf2dd77..cb405fe 100644
--- a/chrome/browser/service/service_process_control_manager.cc
+++ b/chrome/browser/service/service_process_control_manager.cc
@@ -42,6 +42,6 @@ void ServiceProcessControlManager::Shutdown() {
 }
 
 // static
-ServiceProcessControlManager* ServiceProcessControlManager::instance() {
+ServiceProcessControlManager* ServiceProcessControlManager::GetInstance() {
   return Singleton<ServiceProcessControlManager>::get();
 }
diff --git a/chrome/browser/service/service_process_control_manager.h b/chrome/browser/service/service_process_control_manager.h
index a57c43e..a27ec03 100644
--- a/chrome/browser/service/service_process_control_manager.h
+++ b/chrome/browser/service/service_process_control_manager.h
@@ -32,7 +32,7 @@ class ServiceProcessControlManager {
   void Shutdown();
 
   // Return the instance of ServiceProcessControlManager.
-  static ServiceProcessControlManager* instance();
+  static ServiceProcessControlManager* GetInstance();
 
  private:
   ServiceProcessControlList process_control_list_;