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

chrome/browser/extensions/extension_function_dispatcher.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.
 
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 
 #include <map>
 
 #include "base/process_util.h"
 #include "base/singleton.h"
@@ skipping 57 matching lines @@
 // Template for defining ExtensionFunctionFactory.
 template<class T>
 ExtensionFunction* NewExtensionFunction() {
   return new T();
 }
 
 // Contains a list of all known extension functions and allows clients to
 // create instances of them.
 class FactoryRegistry {
  public:
-  static FactoryRegistry* instance();
+  static FactoryRegistry* GetInstance();
   FactoryRegistry() { ResetFunctions(); }
 
   // Resets all functions to their default values.
   void ResetFunctions();
 
   // Adds all function names to 'names'.
   void GetAllNames(std::vector<std::string>* names);
 
   // Allows overriding of specific functions (e.g. for testing).  Functions
   // must be previously registered.  Returns true if successful.
   bool OverrideFunction(const std::string& name,
                         ExtensionFunctionFactory factory);
 
   // Factory method for the ExtensionFunction registered as 'name'.
   ExtensionFunction* NewFunction(const std::string& name);
 
  private:
   template<class T>
   void RegisterFunction() {
     factories_[T::function_name()] = &NewExtensionFunction<T>;
   }
 
   typedef std::map<std::string, ExtensionFunctionFactory> FactoryMap;
   FactoryMap factories_;
 };
 
-FactoryRegistry* FactoryRegistry::instance() {
+FactoryRegistry* FactoryRegistry::GetInstance() {
   return Singleton<FactoryRegistry>::get();
 }
 
 void FactoryRegistry::ResetFunctions() {
   // Register all functions here.
 
   // Windows
   RegisterFunction<GetWindowFunction>();
   RegisterFunction<GetCurrentWindowFunction>();
   RegisterFunction<GetLastFocusedWindowFunction>();
@@ skipping 202 matching lines @@
   function->set_name(name);
   return function;
 }
 
 };  // namespace
 
 // ExtensionFunctionDispatcher -------------------------------------------------
 
 void ExtensionFunctionDispatcher::GetAllFunctionNames(
     std::vector<std::string>* names) {
-  FactoryRegistry::instance()->GetAllNames(names);
+  FactoryRegistry::GetInstance()->GetAllNames(names);
 }
 
 bool ExtensionFunctionDispatcher::OverrideFunction(
     const std::string& name, ExtensionFunctionFactory factory) {
-  return FactoryRegistry::instance()->OverrideFunction(name, factory);
+  return FactoryRegistry::GetInstance()->OverrideFunction(name, factory);
 }
 
 void ExtensionFunctionDispatcher::ResetFunctions() {
-  FactoryRegistry::instance()->ResetFunctions();
+  FactoryRegistry::GetInstance()->ResetFunctions();
 }
 
 ExtensionFunctionDispatcher* ExtensionFunctionDispatcher::Create(
     RenderViewHost* render_view_host,
     Delegate* delegate,
     const GURL& url) {
   ExtensionsService* service =
       render_view_host->process()->profile()->GetExtensionsService();
   DCHECK(service);
 
@@ skipping 89 matching lines @@
   // before the browser is sufficiently initialized to return here.
   // A similar situation may arise during shutdown.
   // TODO(rafaelw): Delay creation of background_page until the browser
   // is available. http://code.google.com/p/chromium/issues/detail?id=13284
   return browser;
 }
 
 void ExtensionFunctionDispatcher::HandleRequest(
     const ViewHostMsg_DomMessage_Params& params) {
   scoped_refptr<ExtensionFunction> function(
-      FactoryRegistry::instance()->NewFunction(params.name));
+      FactoryRegistry::GetInstance()->NewFunction(params.name));
   function->set_dispatcher_peer(peer_);
   function->set_profile(profile_);
   function->set_extension_id(extension_id());
   function->SetArgs(&params.arguments);
   function->set_source_url(params.source_url);
   function->set_request_id(params.request_id);
   function->set_has_callback(params.has_callback);
   function->set_user_gesture(params.user_gesture);
   ExtensionsService* service = profile()->GetExtensionsService();
   DCHECK(service);
@@ skipping 36 matching lines @@
   } else {
     NOTREACHED();
     base::KillProcess(render_view_host_->process()->GetHandle(),
                       ResultCodes::KILLED_BAD_MESSAGE, false);
   }
 }
 
 Profile* ExtensionFunctionDispatcher::profile() {
   return profile_;
 }