Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(11)

Unified Diff: base/debug/trace_event_impl.cc

Issue 18338004: Don't use StaticMemorySingletonTraits for TraceLog. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: no need for ManualTestSetUp anymore per scheib Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/debug/trace_event_impl.h ('k') | base/debug/trace_event_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/debug/trace_event_impl.cc
===================================================================
--- base/debug/trace_event_impl.cc (revision 210376)
+++ base/debug/trace_event_impl.cc (working copy)
@@ -36,7 +36,7 @@
public:
static void Delete() {
Singleton<base::debug::TraceLog,
- StaticMemorySingletonTraits<base::debug::TraceLog> >::OnExit(0);
+ LeakySingletonTraits<base::debug::TraceLog> >::OnExit(0);
}
};
@@ -743,7 +743,7 @@
// static
TraceLog* TraceLog::GetInstance() {
- return Singleton<TraceLog, StaticMemorySingletonTraits<TraceLog> >::get();
+ return Singleton<TraceLog, LeakySingletonTraits<TraceLog> >::get();
}
// static
@@ -775,6 +775,7 @@
TraceLog::TraceLog()
: enable_count_(0),
num_traces_recorded_(0),
+ event_callback_(NULL),
dispatching_to_observer_list_(false),
watch_category_(NULL),
trace_options_(RECORD_UNTIL_FULL),
@@ -1325,10 +1326,6 @@
DeleteTraceLogForTesting::Delete();
}
-void TraceLog::Resurrect() {
- StaticMemorySingletonTraits<TraceLog>::Resurrect();
-}
-
void TraceLog::SetProcessID(int process_id) {
process_id_ = process_id;
// Create a FNV hash from the process ID for XORing.
« no previous file with comments | « base/debug/trace_event_impl.h ('k') | base/debug/trace_event_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698