diff options
| author | satish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-13 08:18:55 +0000 |
|---|---|---|
| committer | satish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-13 08:18:55 +0000 |
| commit | 8e8bb6d329bdad0efe5bddd5d39e0efe64d9846a (patch) | |
| tree | a7425d106d83f1f031516e18ea9600363341fdb8 /net | |
| parent | 1bc1c69f95dab2c34232a5c8793cf9db51af2386 (diff) | |
| download | chromium_src-8e8bb6d329bdad0efe5bddd5d39e0efe64d9846a.zip chromium_src-8e8bb6d329bdad0efe5bddd5d39e0efe64d9846a.tar.gz chromium_src-8e8bb6d329bdad0efe5bddd5d39e0efe64d9846a.tar.bz2 | |
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
Diffstat (limited to 'net')
| -rw-r--r-- | net/base/registry_controlled_domain.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/base/registry_controlled_domain.h b/net/base/registry_controlled_domain.h index fc64f3a..7586c12 100644 --- a/net/base/registry_controlled_domain.h +++ b/net/base/registry_controlled_domain.h @@ -198,6 +198,11 @@ class RegistryControlledDomainService { 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(); + protected: // The entire protected API is only for unit testing. I mean it. Don't make // me come over there! @@ -221,11 +226,6 @@ class RegistryControlledDomainService { // 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, |