| 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.
|
|
|