Move Singleton and related structs to namespace base

chrome/browser/policy/profile_policy_connector_factory.h

 // Copyright (c) 2013 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.
 
 #ifndef CHROME_BROWSER_POLICY_PROFILE_POLICY_CONNECTOR_FACTORY_H_
 #define CHROME_BROWSER_POLICY_PROFILE_POLICY_CONNECTOR_FACTORY_H_
 
 #include <list>
 #include <map>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "components/keyed_service/content/browser_context_keyed_base_factory.h"
 
+namespace base {
 template <typename T>
 struct DefaultSingletonTraits;
 
-namespace base {
 class SequencedTaskRunner;
-}
+}  // namespace base
 
 namespace content {
 class BrowserContext;
 }
 
 namespace policy {
 
 class ConfigurationPolicyProvider;
 class ProfilePolicyConnector;
 
@@ skipping 25 matching lines @@
   // methods of BrowserContextKeyedServiceFactory.
   void SetServiceForTesting(content::BrowserContext* context,
                             ProfilePolicyConnector* connector);
 
   // The next Profile to call CreateForBrowserContext() will get a PolicyService
   // with |provider| as its sole policy provider. This can be called multiple
   // times to override the policy providers for more than 1 Profile.
   void PushProviderForTesting(ConfigurationPolicyProvider* provider);
 
  private:
-  friend struct DefaultSingletonTraits<ProfilePolicyConnectorFactory>;
+  friend struct base::DefaultSingletonTraits<ProfilePolicyConnectorFactory>;
 
   ProfilePolicyConnectorFactory();
   ~ProfilePolicyConnectorFactory() override;
 
   ProfilePolicyConnector* GetForBrowserContextInternal(
       content::BrowserContext* context);
 
   scoped_ptr<ProfilePolicyConnector> CreateForBrowserContextInternal(
       content::BrowserContext* context,
       bool force_immediate_load);
 
   // BrowserContextKeyedBaseFactory:
   void BrowserContextShutdown(content::BrowserContext* context) override;
   void BrowserContextDestroyed(content::BrowserContext* context) override;
   void SetEmptyTestingFactory(content::BrowserContext* context) override;
   bool HasTestingFactory(content::BrowserContext* context) override;
   void CreateServiceNow(content::BrowserContext* context) override;
 
   typedef std::map<content::BrowserContext*, ProfilePolicyConnector*>
       ConnectorMap;
   ConnectorMap connectors_;
   std::list<ConfigurationPolicyProvider*> test_providers_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfilePolicyConnectorFactory);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_POLICY_PROFILE_POLICY_CONNECTOR_FACTORY_H_