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, 7 insertions, 7 deletions

diff --git a/ipc/ipc_channel_posix.cc b/ipc/ipc_channel_posix.cc
index 9d0b81a..0d0160b 100644
--- a/ipc/ipc_channel_posix.cc
+++ b/ipc/ipc_channel_posix.cc
@@ -939,7 +939,7 @@ bool Channel::ChannelImpl::Send(Message* message) {
            << " (" << output_queue_.size() << " in queue)";
 
 #ifdef IPC_MESSAGE_LOG_ENABLED
-  Logging::current()->OnSendMessage(message, "");
+  Logging::GetInstance()->OnSendMessage(message, "");
 #endif
 
   output_queue_.push(message);
diff --git a/ipc/ipc_channel_proxy.cc b/ipc/ipc_channel_proxy.cc
index fd5144c..aba6bf5e 100644
--- a/ipc/ipc_channel_proxy.cc
+++ b/ipc/ipc_channel_proxy.cc
@@ -78,7 +78,7 @@ void ChannelProxy::Context::CreateChannel(const IPC::ChannelHandle& handle,
 
 bool ChannelProxy::Context::TryFilters(const Message& message) {
 #ifdef IPC_MESSAGE_LOG_ENABLED
-  Logging* logger = Logging::current();
+  Logging* logger = Logging::GetInstance();
   if (logger->Enabled())
     logger->OnPreDispatchMessage(message);
 #endif
@@ -240,7 +240,7 @@ void ChannelProxy::Context::OnDispatchMessage(const Message& message) {
   OnDispatchConnected();
 
 #ifdef IPC_MESSAGE_LOG_ENABLED
-  Logging* logger = Logging::current();
+  Logging* logger = Logging::GetInstance();
   if (message.type() == IPC_LOGGING_ID) {
     logger->OnReceivedLoggingMessage(message);
     return;
@@ -340,7 +340,7 @@ void ChannelProxy::Close() {
 
 bool ChannelProxy::Send(Message* message) {
 #ifdef IPC_MESSAGE_LOG_ENABLED
-  Logging::current()->OnSendMessage(message, context_->channel_id());
+  Logging::GetInstance()->OnSendMessage(message, context_->channel_id());
 #endif
 
   context_->ipc_message_loop()->PostTask(FROM_HERE,
diff --git a/ipc/ipc_channel_win.cc b/ipc/ipc_channel_win.cc
index 28a880d..e12c521 100644
--- a/ipc/ipc_channel_win.cc
+++ b/ipc/ipc_channel_win.cc
@@ -152,7 +152,7 @@ bool Channel::ChannelImpl::Send(Message* message) {
            << " (" << output_queue_.size() << " in queue)";
 
 #ifdef IPC_MESSAGE_LOG_ENABLED
-  Logging::current()->OnSendMessage(message, "");
+  Logging::GetInstance()->OnSendMessage(message, "");
 #endif
 
   output_queue_.push(message);
diff --git a/ipc/ipc_logging.cc b/ipc/ipc_logging.cc
index 3b26cdc..2abbf0a 100644
--- a/ipc/ipc_logging.cc
+++ b/ipc/ipc_logging.cc
@@ -66,7 +66,7 @@ Logging::Logging()
 Logging::~Logging() {
 }
 
-Logging* Logging::current() {
+Logging* Logging::GetInstance() {
   return Singleton<Logging>::get();
 }
 
diff --git a/ipc/ipc_logging.h b/ipc/ipc_logging.h
index ee2f62b..56c8d1c 100644
--- a/ipc/ipc_logging.h
+++ b/ipc/ipc_logging.h
@@ -46,7 +46,7 @@ class Logging {
   void SetConsumer(Consumer* consumer);
 
   ~Logging();
-  static Logging* current();
+  static Logging* GetInstance();
 
   // Enable and Disable are NOT cross-process; they only affect the
   // current thread/process.  If you want to modify the value for all