Move Singleton and related structs to namespace base

chrome/browser/chromeos/camera_presence_notifier.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 "chrome/browser/chromeos/camera_presence_notifier.h"
 
 #include "base/bind.h"
 #include "base/memory/singleton.h"
 #include "base/time/time.h"
 #include "chrome/browser/chromeos/camera_detector.h"
 
 namespace chromeos {
 
 namespace {
 
 // Interval between checks for camera presence.
 const int kCameraCheckIntervalSeconds = 3;
 
 }  // namespace
 
 CameraPresenceNotifier::CameraPresenceNotifier() :
     camera_present_on_last_check_(false),
     weak_factory_(this) {}
 
 CameraPresenceNotifier::~CameraPresenceNotifier() {}
 
 // static
 CameraPresenceNotifier* CameraPresenceNotifier::GetInstance() {
-  return Singleton<CameraPresenceNotifier>::get();
+  return base::Singleton<CameraPresenceNotifier>::get();
 }
 
 void CameraPresenceNotifier::AddObserver(
     CameraPresenceNotifier::Observer* observer) {
   bool had_no_observers = !observers_.might_have_observers();
   observers_.AddObserver(observer);
   observer->OnCameraPresenceCheckDone(camera_present_on_last_check_);
   if (had_no_observers) {
     CheckCameraPresence();
     camera_check_timer_.Start(
@@ skipping 24 matching lines @@
       CameraDetector::camera_presence() == CameraDetector::kCameraPresent;
   if (is_camera_present != camera_present_on_last_check_) {
     camera_present_on_last_check_ = is_camera_present;
     FOR_EACH_OBSERVER(Observer,
                       observers_,
                       OnCameraPresenceCheckDone(camera_present_on_last_check_));
   }
 }
 
 }  // namespace chromeos