Move Singleton and related structs to namespace base

content/browser/device_sensors/sensor_manager_android.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/sensor_manager_android.h"
 
 #include <string.h>
 
 #include "base/android/jni_android.h"
 #include "base/bind.h"
@@ skipping 40 matching lines @@
 }
 
 SensorManagerAndroid::~SensorManagerAndroid() {
 }
 
 bool SensorManagerAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 SensorManagerAndroid* SensorManagerAndroid::GetInstance() {
-  return Singleton<SensorManagerAndroid,
-                   LeakySingletonTraits<SensorManagerAndroid> >::get();
+  return base::Singleton<
+      SensorManagerAndroid,
+      base::LeakySingletonTraits<SensorManagerAndroid>>::get();
 }
 
 void SensorManagerAndroid::GotOrientation(
     JNIEnv*, jobject, double alpha, double beta, double gamma) {
   base::AutoLock autolock(orientation_buffer_lock_);
 
   if (!device_orientation_buffer_)
     return;
 
   device_orientation_buffer_->seqlock.WriteBegin();
@@ skipping 371 matching lines @@
     }
   }
 }
 
 void SensorManagerAndroid::Shutdown() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   is_shutdown_ = true;
 }
 
 }  // namespace content