| Index: base/debug/trace_event_impl.h
|
| ===================================================================
|
| --- base/debug/trace_event_impl.h (revision 210376)
|
| +++ base/debug/trace_event_impl.h (working copy)
|
| @@ -40,7 +40,7 @@
|
| name, reinterpret_cast<const void*>(id), extra)
|
|
|
| template <typename Type>
|
| -struct StaticMemorySingletonTraits;
|
| +struct DefaultSingletonTraits;
|
|
|
| namespace base {
|
|
|
| @@ -440,9 +440,6 @@
|
| // 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 {
|
| @@ -460,7 +457,7 @@
|
| 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
|
|
|