Access singletons with a new GetInstance() method instead of Singleton<T>.

base/debug/trace_event_win_unittest.cc

 // Copyright (c) 2010 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 88 matching lines @@
     }
 
     // Resurrect and initialize the TraceLog singleton instance.
     // On Vista and better, we need the provider registered before we
     // start the private, in-proc session, but on XP we need the global
     // session created and the provider enabled before we register our
     // provider.
     TraceLog* tracelog = NULL;
     if (!is_xp) {
       TraceLog::Resurrect();
-      tracelog = TraceLog::Get();
+      tracelog = TraceLog::GetInstance();
       ASSERT_TRUE(tracelog != NULL);
       ASSERT_FALSE(tracelog->IsTracing());
     }
 
     // Create the log file.
     ASSERT_TRUE(file_util::CreateTemporaryFile(&log_file_));
 
     // Create a private log session on the file.
     EtwTraceProperties prop;
     ASSERT_HRESULT_SUCCEEDED(prop.SetLoggerFileName(log_file_.value().c_str()));
@@ skipping 15 matching lines @@
     ASSERT_HRESULT_SUCCEEDED(controller_.Start(kTestSessionName, &prop));
 
     // Enable the TraceLog provider GUID.
     ASSERT_HRESULT_SUCCEEDED(
         controller_.EnableProvider(kChromeTraceProviderName,
                                    TRACE_LEVEL_INFORMATION,
                                    0));
 
     if (is_xp) {
       TraceLog::Resurrect();
-      tracelog = TraceLog::Get();
+      tracelog = TraceLog::GetInstance();
     }
     ASSERT_TRUE(tracelog != NULL);
     EXPECT_TRUE(tracelog->IsTracing());
   }
 
   void TearDown() {
     EtwTraceProperties prop;
     if (controller_.session() != 0)
       EXPECT_HRESULT_SUCCEEDED(controller_.Stop(&prop));
 
@@ skipping 148 matching lines @@
               kTraceEventTypeInstant,
               kName, strlen(kName),
               kId,
               kExtra, strlen(kExtra));
 
   PlayLog();
 }
 
 }  // namespace debug
 }  // namespace base