Move Singleton and related structs to namespace base

base/trace_event/trace_event_win.cc

 // Copyright (c) 2012 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/trace_event/trace_event_win.h"
 
 #include "base/logging.h"
 #include "base/memory/singleton.h"
 #include <initguid.h>  // NOLINT
 
@@ skipping 23 matching lines @@
     0x2930,
     0x4ac3,
     {0x80, 0x46, 0xb6, 0x76, 0x3b, 0x63, 0x1d, 0xfe}};
 
 TraceEventETWProvider::TraceEventETWProvider() :
     EtwTraceProvider(kChromeTraceProviderName) {
   Register();
 }
 
 TraceEventETWProvider* TraceEventETWProvider::GetInstance() {
-  return Singleton<TraceEventETWProvider,
-      StaticMemorySingletonTraits<TraceEventETWProvider> >::get();
+  return base::Singleton<TraceEventETWProvider,
+      base::StaticMemorySingletonTraits<TraceEventETWProvider> >::get();
 }
 
 bool TraceEventETWProvider::StartTracing() {
   return true;
 }
 
 void TraceEventETWProvider::TraceEvent(const char* name,
                                        size_t name_len,
                                        char type,
                                        const void* id,
@@ skipping 67 matching lines @@
     provider->TraceEvent(name, name_len, type, id, extra, extra_len);
   }
 }
 
 void TraceEventETWProvider::Resurrect() {
   StaticMemorySingletonTraits<TraceEventETWProvider>::Resurrect();
 }
 
 }  // namespace trace_event
 }  // namespace base