Move Singleton and related structs to namespace base

content/browser/device_sensors/sensor_manager_android.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_DEVICE_SENSORS_SENSOR_MANAGER_ANDROID_H_
 #define CONTENT_BROWSER_DEVICE_SENSORS_SENSOR_MANAGER_ANDROID_H_
 
 #include "base/android/scoped_java_ref.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
 #include "content/common/content_export.h"
 #include "content/common/device_sensors/device_light_hardware_buffer.h"
 #include "content/common/device_sensors/device_motion_hardware_buffer.h"
 #include "content/common/device_sensors/device_orientation_hardware_buffer.h"
 
-template<typename T> struct DefaultSingletonTraits;
+namespace base {
+template <typename T>
+struct DefaultSingletonTraits;
+}
 
 namespace content {
 
 // Android implementation of Device {Motion|Orientation|Light} API.
 //
 // Android's SensorManager has a push API, so when Got*() methods are called
 // by the system the browser process puts the received data into a shared
 // memory buffer, which is read by the renderer processes.
 class CONTENT_EXPORT SensorManagerAndroid {
  public:
@@ skipping 49 matching lines @@
   void StopFetchingLightDataOnUI();
 
   void StartFetchingMotionDataOnUI(DeviceMotionHardwareBuffer* buffer);
   void StopFetchingMotionDataOnUI();
 
   void StartFetchingOrientationDataOnUI(
       DeviceOrientationHardwareBuffer* buffer);
   void StopFetchingOrientationDataOnUI();
 
  private:
-  friend struct DefaultSingletonTraits<SensorManagerAndroid>;
+  friend struct base::DefaultSingletonTraits<SensorManagerAndroid>;
 
   enum {
     RECEIVED_MOTION_DATA_ACCELERATION = 0,
     RECEIVED_MOTION_DATA_ACCELERATION_INCL_GRAVITY = 1,
     RECEIVED_MOTION_DATA_ROTATION_RATE = 2,
     RECEIVED_MOTION_DATA_MAX = 3,
   };
 
   void SetLightBufferValue(double lux);
 
@@ skipping 19 matching lines @@
   base::Lock orientation_buffer_lock_;
 
   bool is_shutdown_;
 
   DISALLOW_COPY_AND_ASSIGN(SensorManagerAndroid);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_DEVICE_SENSORS_SENSOR_MANAGER_ANDROID_H_