Move Singleton and related structs to namespace base

skia/ext/skia_memory_dump_provider.cc

 // Copyright 2015 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 "skia_memory_dump_provider.h"
 
 #include "base/trace_event/memory_allocator_dump.h"
 #include "base/trace_event/memory_dump_manager.h"
 #include "base/trace_event/process_memory_dump.h"
 #include "skia/ext/SkTraceMemoryDump_chrome.h"
 #include "third_party/skia/include/core/SkGraphics.h"
 
 namespace skia {
 
 // static
 SkiaMemoryDumpProvider* SkiaMemoryDumpProvider::GetInstance() {
-  return Singleton<SkiaMemoryDumpProvider,
-                   LeakySingletonTraits<SkiaMemoryDumpProvider>>::get();
+  return base::Singleton<
+      SkiaMemoryDumpProvider,
+      base::LeakySingletonTraits<SkiaMemoryDumpProvider>>::get();
 }
 
 SkiaMemoryDumpProvider::SkiaMemoryDumpProvider() {}
 
 SkiaMemoryDumpProvider::~SkiaMemoryDumpProvider() {}
 
 bool SkiaMemoryDumpProvider::OnMemoryDump(
     const base::trace_event::MemoryDumpArgs& args,
     base::trace_event::ProcessMemoryDump* process_memory_dump) {
   base::trace_event::MemoryAllocatorDump* font_mad =
       process_memory_dump->CreateAllocatorDump("skia/sk_glyph_cache");
   font_mad->AddScalar(base::trace_event::MemoryAllocatorDump::kNameSize,
                       base::trace_event::MemoryAllocatorDump::kUnitsBytes,
                       SkGraphics::GetFontCacheUsed());
   font_mad->AddScalar(base::trace_event::MemoryAllocatorDump::kNameObjectsCount,
                       base::trace_event::MemoryAllocatorDump::kUnitsObjects,
                       SkGraphics::GetFontCacheCountUsed());
 
   // TODO(ssid): Use MemoryDumpArgs to create light dumps when requested
   // (crbug.com/499731).
   SkTraceMemoryDump_Chrome skia_dumper(process_memory_dump);
   SkGraphics::DumpMemoryStatistics(&skia_dumper);
 
   return true;
 }
 
 }  // namespace skia