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

Unified Diff: trace_event/trace_log.cc

Issue 2045223003: Update to Chromium //base at Chromium commit 82baa9afc6620c68cb2168f20bb65e77e3e57f0a. (Closed) Base URL: https://github.com/domokit/base.git@master
Patch Set: Created 4 years, 6 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 | « trace_event/trace_log.h ('k') | trace_event/winheap_dump_provider_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trace_event/trace_log.cc
diff --git a/trace_event/trace_log.cc b/trace_event/trace_log.cc
index 2822c3742f51b70752589ef573a6da9fd8fe2be9..519bb2b41250a170ab60dbd9836580067b91762a 100644
--- a/trace_event/trace_log.cc
+++ b/trace_event/trace_log.cc
@@ -39,18 +39,22 @@
#include "base/trace_event/trace_event_win.h"
#endif
+// The thread buckets for the sampling profiler.
+BASE_EXPORT TRACE_EVENT_API_ATOMIC_WORD g_trace_state[3];
+
+namespace base {
+namespace internal {
+
class DeleteTraceLogForTesting {
public:
static void Delete() {
- Singleton<base::trace_event::TraceLog,
- LeakySingletonTraits<base::trace_event::TraceLog>>::OnExit(0);
+ Singleton<trace_event::TraceLog,
+ LeakySingletonTraits<trace_event::TraceLog>>::OnExit(0);
}
};
-// The thread buckets for the sampling profiler.
-BASE_EXPORT TRACE_EVENT_API_ATOMIC_WORD g_trace_state[3];
+} // namespace internal
-namespace base {
namespace trace_event {
namespace {
@@ -1539,7 +1543,7 @@ void TraceLog::WaitSamplingEventForTesting() {
}
void TraceLog::DeleteForTesting() {
- DeleteTraceLogForTesting::Delete();
+ internal::DeleteTraceLogForTesting::Delete();
}
TraceEvent* TraceLog::GetEventByHandle(TraceEventHandle handle) {
« no previous file with comments | « trace_event/trace_log.h ('k') | trace_event/winheap_dump_provider_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698