Move Singleton and related structs to namespace base

content/browser/device_sensors/device_inertial_sensor_service.cc

 // 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.
 
 #include "content/browser/device_sensors/device_inertial_sensor_service.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/singleton.h"
 #include "content/browser/device_sensors/data_fetcher_shared_memory.h"
 
 namespace content {
 
 DeviceInertialSensorService::DeviceInertialSensorService()
     : num_light_readers_(0),
       num_motion_readers_(0),
       num_orientation_readers_(0),
       is_shutdown_(false) {
 }
 
 DeviceInertialSensorService::~DeviceInertialSensorService() {
 }
 
 DeviceInertialSensorService* DeviceInertialSensorService::GetInstance() {
-  return Singleton<DeviceInertialSensorService,
-                   LeakySingletonTraits<DeviceInertialSensorService> >::get();
+  return base::Singleton<
+      DeviceInertialSensorService,
+      base::LeakySingletonTraits<DeviceInertialSensorService>>::get();
 }
 
 void DeviceInertialSensorService::AddConsumer(ConsumerType consumer_type) {
   if (!ChangeNumberConsumers(consumer_type, 1))
     return;
 
   DCHECK(GetNumberConsumers(consumer_type));
 
   if (!data_fetcher_)
     data_fetcher_.reset(new DataFetcherSharedMemory);
@@ skipping 64 matching lines @@
 }
 
 void DeviceInertialSensorService::SetDataFetcherForTesting(
     DataFetcherSharedMemory* test_data_fetcher) {
   if (data_fetcher_)
     data_fetcher_->Shutdown();
   data_fetcher_.reset(test_data_fetcher);
 }
 
 }  // namespace content