Index: net/base/registry_controlled_domain.cc |
diff --git a/net/base/registry_controlled_domain.cc b/net/base/registry_controlled_domain.cc |
index 88eccd0c1a0ba4f8b7eda743a3fa907d252a683e..1ee88747027887987e41ee8e8a45e846506254d0 100644 |
--- a/net/base/registry_controlled_domain.cc |
+++ b/net/base/registry_controlled_domain.cc |
@@ -51,12 +51,14 @@ |
namespace net { |
-static const int kExceptionRule = 1; |
-static const int kWildcardRule = 2; |
+namespace { |
-RegistryControlledDomainService::RegistryControlledDomainService() |
- : find_domain_function_(Perfect_Hash::FindDomain) { |
-} |
+const int kExceptionRule = 1; |
+const int kWildcardRule = 2; |
+ |
+RegistryControlledDomainService* test_instance_; |
+ |
+} // namespace |
// static |
std::string RegistryControlledDomainService::GetDomainAndRegistry( |
@@ -155,6 +157,34 @@ size_t RegistryControlledDomainService::GetRegistryLength( |
} |
// static |
+RegistryControlledDomainService* RegistryControlledDomainService::GetInstance() |
+{ |
+ if (test_instance_) |
+ return test_instance_; |
+ |
+ return Singleton<RegistryControlledDomainService>::get(); |
+} |
+ |
+RegistryControlledDomainService::RegistryControlledDomainService() |
+ : find_domain_function_(Perfect_Hash::FindDomain) { |
+} |
+ |
+// static |
+RegistryControlledDomainService* RegistryControlledDomainService::SetInstance( |
+ RegistryControlledDomainService* instance) { |
+ RegistryControlledDomainService* old_instance = test_instance_; |
+ test_instance_ = instance; |
+ return old_instance; |
+} |
+ |
+// static |
+void RegistryControlledDomainService::UseFindDomainFunction( |
+ FindDomainPtr function) { |
+ RegistryControlledDomainService* instance = GetInstance(); |
+ instance->find_domain_function_ = function; |
+} |
+ |
+// static |
std::string RegistryControlledDomainService::GetDomainAndRegistryImpl( |
const std::string& host) { |
DCHECK(!host.empty()); |
@@ -261,30 +291,4 @@ size_t RegistryControlledDomainService::GetRegistryLengthImpl( |
return allow_unknown_registries ? (host.length() - curr_start) : 0; |
} |
-static RegistryControlledDomainService* test_instance_; |
- |
-// static |
-RegistryControlledDomainService* RegistryControlledDomainService::SetInstance( |
- RegistryControlledDomainService* instance) { |
- RegistryControlledDomainService* old_instance = test_instance_; |
- test_instance_ = instance; |
- return old_instance; |
-} |
- |
-// static |
-RegistryControlledDomainService* RegistryControlledDomainService::GetInstance() |
-{ |
- if (test_instance_) |
- return test_instance_; |
- |
- return Singleton<RegistryControlledDomainService>::get(); |
-} |
- |
-// static |
-void RegistryControlledDomainService::UseFindDomainFunction( |
- FindDomainPtr function) { |
- RegistryControlledDomainService* instance = GetInstance(); |
- instance->find_domain_function_ = function; |
-} |
- |
} // namespace net |