Move Singleton and related structs to namespace base

content/browser/geofencing/geofencing_service.h

 // Copyright 2014 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 CONTENT_BROWSER_GEOFENCING_GEOFENCING_SERVICE_H_
 #define CONTENT_BROWSER_GEOFENCING_GEOFENCING_SERVICE_H_
 
 #include <map>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/common/content_export.h"
 #include "content/common/geofencing_types.h"
 
+namespace base {
 template <typename T>
 struct DefaultSingletonTraits;
+}
 
 namespace blink {
 struct WebCircularGeofencingRegion;
 };
 
 namespace content {
 
 class GeofencingProvider;
 class GeofencingRegistrationDelegate;
 
@@ skipping 35 matching lines @@
 
   // GeofencingServiceInterface implementation.
   bool IsServiceAvailable() override;
   int64 RegisterRegion(
       const blink::WebCircularGeofencingRegion& region,
       GeofencingRegistrationDelegate* delegate) override;
   void UnregisterRegion(int64 geofencing_registration_id) override;
 
  protected:
   friend class GeofencingServiceTest;
-  friend struct DefaultSingletonTraits<GeofencingServiceImpl>;
+  friend struct base::DefaultSingletonTraits<GeofencingServiceImpl>;
   GeofencingServiceImpl();
   ~GeofencingServiceImpl() override;
 
   void SetProviderForTesting(scoped_ptr<GeofencingProvider> provider);
   int RegistrationCountForTesting();
 
  private:
   struct Registration;
   typedef std::map<int64, Registration> RegistrationsMap;
 
@@ skipping 13 matching lines @@
   int64 next_registration_id_;
   RegistrationsMap registrations_;
   scoped_ptr<GeofencingProvider> provider_;
 
   DISALLOW_COPY_AND_ASSIGN(GeofencingServiceImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_GEOFENCING_GEOFENCING_SERVICE_H_