Don't use StaticMemorySingletonTraits for TraceLog.

base/debug/trace_event_win_unittest.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/debug/trace_event.h"
 
 #include <strstream>
 
 #include "base/at_exit.h"
 #include "base/basictypes.h"
@@ skipping 140 matching lines @@
     EXPECT_TRUE(tracelog->IsTracing());
   }
 
   void TearDown() {
     EtwTraceProperties prop;
     if (controller_.session() != 0)
       EXPECT_HRESULT_SUCCEEDED(controller_.Stop(&prop));
 
     if (!log_file_.value().empty())
       base::Delete(log_file_, false);
+
+    // We want our singleton torn down after each test.
+    TraceLog::DeleteForTesting();
   }
 
   void ExpectEvent(REFGUID guid,
                    EtwEventType type,
                    const char* name,
                    size_t name_len,
                    const void* id,
                    const char* extra,
                    size_t extra_len) {
     // Build the trace event buffer we expect will result from this.
@@ skipping 136 matching lines @@
               kTraceEventTypeInstant,
               kName, strlen(kName),
               kId,
               kExtra, strlen(kExtra));
 
   PlayLog();
 }
 
 }  // namespace debug
 }  // namespace base