Don't use StaticMemorySingletonTraits for TraceLog.

base/debug/trace_event_impl.h

 // 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.
 
 
 #ifndef BASE_DEBUG_TRACE_EVENT_IMPL_H_
 #define BASE_DEBUG_TRACE_EVENT_IMPL_H_
 
 #include <stack>
 #include <string>
@@ skipping 22 matching lines @@
     base::debug::TraceLog::AddTraceEventEtw( \
         TRACE_EVENT_PHASE_END, \
         name, reinterpret_cast<const void*>(id), extra)
 
 #define TRACE_EVENT_INSTANT_ETW(name, id, extra) \
     base::debug::TraceLog::AddTraceEventEtw( \
         TRACE_EVENT_PHASE_INSTANT, \
         name, reinterpret_cast<const void*>(id), extra)
 
 template <typename Type>
-struct StaticMemorySingletonTraits;
+struct DefaultSingletonTraits;
 
 namespace base {
 
 class WaitableEvent;
 
 namespace debug {
 
 // For any argument of type TRACE_VALUE_TYPE_CONVERTABLE the provided
 // class must implement this interface.
 class ConvertableToTraceFormat {
@@ skipping 379 matching lines @@
 
   int process_id() const { return process_id_; }
 
   // Exposed for unittesting:
 
   void InstallWaitableEventForSamplingTesting(WaitableEvent* waitable_event);
 
   // Allows deleting our singleton instance.
   static void DeleteForTesting();
 
-  // Allows resurrecting our singleton instance post-AtExit processing.
-  static void Resurrect();
-
   // Allow tests to inspect TraceEvents.
   size_t GetEventsSize() const { return logged_events_->Size(); }
   const TraceEvent& GetEventAt(size_t index) const {
     return logged_events_->GetEventAt(index);
   }
 
   void SetProcessID(int process_id);
 
   // Allow setting an offset between the current TimeTicks time and the time
   // that should be reported.
   void SetTimeOffset(TimeDelta offset);
 
   size_t GetObserverCountForTest() const;
 
  private:
   // This allows constructor and destructor to be private and usable only
   // by the Singleton class.
-  friend struct StaticMemorySingletonTraits<TraceLog>;
+  friend struct DefaultSingletonTraits<TraceLog>;
 
   // Enable/disable each category group based on the current category_filter_.
   // If the category group contains a category that matches an included category
   // pattern, that category group will be enabled.
   void EnableIncludedCategoryGroups();
   void EnableIncludedCategoryGroup(int category_index);
 
   static void SetCategoryGroupEnabled(int category_index, bool enabled);
   static bool IsCategoryGroupEnabled(
       const unsigned char* category_group_enabled);
@@ skipping 88 matching lines @@
 
   CategoryFilter category_filter_;
 
   DISALLOW_COPY_AND_ASSIGN(TraceLog);
 };
 
 }  // namespace debug
 }  // namespace base
 
 #endif  // BASE_DEBUG_TRACE_EVENT_IMPL_H_