Move Singleton and related structs to namespace base

chrome/browser/chromeos/device_uma.cc

 // Copyright 2013 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 "chrome/browser/chromeos/device_uma.h"
 
 #include <X11/extensions/XInput.h>
 #include <X11/extensions/XInput2.h>
 
 #include "base/logging.h"
@@ skipping 11 matching lines @@
   UMA_CROS_GESTURE_METRICS_NOISY_GROUND,
   // NOTE: Add states only immediately above this line. Make sure to
   // update the enum list in tools/metrics/histograms/histograms.xml
   // accordingly.
   UMA_CROS_GESTURE_METRICS_COUNT
 };
 
 namespace chromeos {
 
 DeviceUMA* DeviceUMA::GetInstance() {
-  return Singleton<DeviceUMA>::get();
+  return base::Singleton<DeviceUMA>::get();
 }
 
 DeviceUMA::DeviceUMA()
     : stopped_(false) {
   ui::PlatformEventSource::GetInstance()->AddPlatformEventObserver(this);
 }
 
 DeviceUMA::~DeviceUMA() {
   Stop();
 }
@@ skipping 50 matching lines @@
       }
       break;
     }
     default:
       break;
   }
   return;
 }
 
 }  // namespace chromeos