Move Singleton and related structs to namespace base

content/public/browser/desktop_media_id.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 "content/public/browser/desktop_media_id.h"
 
 #include <vector>
 
 #include "base/id_map.h"
 #include "base/memory/singleton.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 
 #if defined(USE_AURA)
 #include "ui/aura/window.h"
 #include "ui/aura/window_observer.h"
 #endif  // defined(USE_AURA)
 
 namespace  {
 
 #if defined(USE_AURA)
 
 class AuraWindowRegistry : public aura::WindowObserver {
  public:
   static AuraWindowRegistry* GetInstance() {
-    return Singleton<AuraWindowRegistry>::get();
+    return base::Singleton<AuraWindowRegistry>::get();
   }
 
   int RegisterWindow(aura::Window* window) {
     IDMap<aura::Window>::const_iterator it(&registered_windows_);
     for (; !it.IsAtEnd(); it.Advance()) {
       if (it.GetCurrentValue() == window)
         return it.GetCurrentKey();
     }
 
     window->AddObserver(this);
     return registered_windows_.Add(window);
   }
 
   aura::Window* GetWindowById(int id) {
     return registered_windows_.Lookup(id);
   }
 
  private:
-  friend struct DefaultSingletonTraits<AuraWindowRegistry>;
+  friend struct base::DefaultSingletonTraits<AuraWindowRegistry>;
 
   AuraWindowRegistry() {}
   ~AuraWindowRegistry() override {}
 
   // WindowObserver overrides.
   void OnWindowDestroying(aura::Window* window) override {
     IDMap<aura::Window>::iterator it(&registered_windows_);
     for (; !it.IsAtEnd(); it.Advance()) {
       if (it.GetCurrentValue() == window) {
         registered_windows_.Remove(it.GetCurrentKey());
@@ skipping 94 matching lines @@
 
 #if defined(USE_AURA)
   prefix.append(":");
   prefix.append(base::Int64ToString(aura_id));
 #endif  // defined(USE_AURA)
 
   return prefix;
 }
 
 }  // namespace content