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

net/base/registry_controlled_domain.h

 //* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
  *
  * Software distributed under the License is distributed on an "AS IS" basis,
@@ skipping 180 matching lines @@
   static size_t GetRegistryLength(const GURL& gurl,
                                   bool allow_unknown_registries);
 
   // Like the GURL version, but takes a host (which is canonicalized internally)
   // instead of a full GURL.
   static size_t GetRegistryLength(const std::string& host,
                                   bool allow_unknown_registries);
   static size_t GetRegistryLength(const std::wstring& host,
                                   bool allow_unknown_registries);
 
+  // Returns the singleton instance, after attempting to initialize it.
+  // NOTE that if the effective-TLD data resource can't be found, the instance
+  // will be initialized and continue operation with simple default TLD data.
+  static RegistryControlledDomainService* GetInstance();

[Nico, 2010/12/12 23:42:47]

Does this have to become public?

+
  protected:
   // The entire protected API is only for unit testing.  I mean it.  Don't make
   // me come over there!
   RegistryControlledDomainService();
 
   // Set the RegistryControledDomainService instance to be used internally.
   // |instance| will supersede the singleton instance normally used.  If
   // |instance| is NULL, normal behavior is restored, and internal operations
   // will return to using the singleton.  This function always returns the
   // instance set by the most recent call to SetInstance.
   static RegistryControlledDomainService* SetInstance(
       RegistryControlledDomainService* instance);
 
   typedef const struct DomainRule* (*FindDomainPtr)(const char *, unsigned int);
 
   // Used for unit tests, so that a different perfect hash map from the full
   // list is used.
   static void UseFindDomainFunction(FindDomainPtr function);
 
  private:
   // To allow construction of the internal singleton instance.
   friend struct DefaultSingletonTraits<RegistryControlledDomainService>;
 
-  // Returns the singleton instance, after attempting to initialize it.
-  // NOTE that if the effective-TLD data resource can't be found, the instance
-  // will be initialized and continue operation with simple default TLD data.
-  static RegistryControlledDomainService* GetInstance();
-
   // Internal workings of the static public methods.  See above.
   static std::string GetDomainAndRegistryImpl(const std::string& host);
   size_t GetRegistryLengthImpl(const std::string& host,
                                bool allow_unknown_registries);
 
   // Function that returns a DomainRule given a domain.
   FindDomainPtr find_domain_function_;
 
   DISALLOW_COPY_AND_ASSIGN(RegistryControlledDomainService);
 };
 
 }  // namespace net
 
 #endif  // NET_BASE_REGISTRY_CONTROLLED_DOMAIN_H_