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

Unified Diff: base/debug/trace_event_impl.h

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 | « no previous file | base/debug/trace_event_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « no previous file | base/debug/trace_event_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698