Move Singleton and related structs to namespace base

base/logging_win.cc

 // Copyright (c) 2011 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 "base/logging_win.h"
 #include "base/memory/singleton.h"
 #include <initguid.h>  // NOLINT
 
 namespace logging {
 
 using base::win::EtwEventLevel;
 using base::win::EtwMofEvent;
 
 DEFINE_GUID(kLogEventId,
     0x7fe69228, 0x633e, 0x4f06, 0x80, 0xc1, 0x52, 0x7f, 0xea, 0x23, 0xe3, 0xa7);
 
 LogEventProvider::LogEventProvider() : old_log_level_(LOG_NONE) {
 }
 
 LogEventProvider* LogEventProvider::GetInstance() {
-  return Singleton<LogEventProvider,
-                   StaticMemorySingletonTraits<LogEventProvider> >::get();
+  return base::Singleton<LogEventProvider, base::StaticMemorySingletonTraits<
+                                               LogEventProvider>>::get();
 }
 
 bool LogEventProvider::LogMessage(logging::LogSeverity severity,
     const char* file, int line, size_t message_start,
     const std::string& message) {
   EtwEventLevel level = TRACE_LEVEL_NONE;
 
   // Convert the log severity to the most appropriate ETW trace level.
   if (severity >= 0) {
     switch (severity) {
@@ skipping 96 matching lines @@
     SetMinLogLevel(TRACE_LEVEL_INFORMATION - level);
   }
 }
 
 void LogEventProvider::OnEventsDisabled() {
   // Restore the old log level.
   SetMinLogLevel(old_log_level_);
 }
 
 }  // namespace logging