Simplify file tracing end events.
R=oysteine@chromium.org
BUG=none
TEST=pathless file trace events with size work
Review URL: https://codereview.chromium.org/1149083012
Cr-Commit-Position: refs/heads/master@{#333498}
CrOS-Libchrome-Original-Commit: 97f619f66b30bcafe0fd211f1e09bcf6ae4f325d
diff --git a/base/files/file_tracing.cc b/base/files/file_tracing.cc
index a1919c4..c25772d 100644
--- a/base/files/file_tracing.cc
+++ b/base/files/file_tracing.cc
@@ -27,13 +27,11 @@
g_provider->FileTracingDisable(this);
}
-FileTracing::ScopedTrace::ScopedTrace() : initialized_(false) {}
+FileTracing::ScopedTrace::ScopedTrace() : id_(nullptr) {}
FileTracing::ScopedTrace::~ScopedTrace() {
- if (initialized_ && g_provider) {
- g_provider->FileTracingEventEnd(
- name_, &file_->trace_enabler_, file_->path_, size_);
- }
+ if (id_ && g_provider)
+ g_provider->FileTracingEventEnd(name_, id_);
}
bool FileTracing::ScopedTrace::ShouldInitialize() const {
@@ -42,15 +40,13 @@
void FileTracing::ScopedTrace::Initialize(
const char* name, File* file, int64 size) {
- file_ = file;
- name_ = name;
- size_ = size;
- initialized_ = true;
+ if (!g_provider)
+ return;
- if (g_provider) {
- g_provider->FileTracingEventBegin(
- name_, &file_->trace_enabler_, file_->path_, size_);
- }
+ id_ = &file->trace_enabler_;
+ name_ = name;
+
+ g_provider->FileTracingEventBegin(name_, id_, file->path_, size);
}
} // namespace base