Move Singleton and related structs to namespace base

chrome/browser/captive_portal/captive_portal_service_factory.h

 // Copyright (c) 2012 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_CAPTIVE_PORTAL_CAPTIVE_PORTAL_SERVICE_FACTORY_H_
 #define CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_SERVICE_FACTORY_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/singleton.h"
@@ skipping 10 matching lines @@
 class CaptivePortalServiceFactory : public BrowserContextKeyedServiceFactory {
  public:
   // Returns the CaptivePortalService for |profile|.
   static CaptivePortalService* GetForProfile(Profile* profile);
 
   static CaptivePortalServiceFactory* GetInstance();
 
  private:
   friend class CaptivePortalBrowserTest;
   friend class CaptivePortalServiceTest;
-  friend struct DefaultSingletonTraits<CaptivePortalServiceFactory>;
+  friend struct base::DefaultSingletonTraits<CaptivePortalServiceFactory>;
 
   CaptivePortalServiceFactory();
   ~CaptivePortalServiceFactory() override;
 
   // BrowserContextKeyedServiceFactory:
   KeyedService* BuildServiceInstanceFor(
       content::BrowserContext* profile) const override;
   content::BrowserContext* GetBrowserContextToUse(
       content::BrowserContext* context) const override;
 
   DISALLOW_COPY_AND_ASSIGN(CaptivePortalServiceFactory);
 };
 
 #endif  // CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_SERVICE_FACTORY_H_