Rename EtwSystemEventConsumerWin to EtwTracingAgent

This brings it up to speed with our present naming, where classes that
inherit from TracingAgent end with TracingAgent themselves.

Review URL: https://codereview.chromium.org/1908373003

Cr-Commit-Position: refs/heads/master@{#389895}

base/trace_event/tracing_agent.h

@@ -22,8 +22,8 @@ class TraceConfig;
 // tracing method that produces its own trace log should implement this
 // interface. All tracing agents must only be controlled by TracingController.
 // Some existing examples include TracingControllerImpl for Chrome trace events,
-// DebugDaemonClient for CrOs system trace, EtwSystemEventConsumer for Windows
-// system trace and PowerTracingAgent for BattOr power trace.
+// DebugDaemonClient for CrOs system trace, EtwTracingAgent for Windows system
+// trace and PowerTracingAgent for BattOr power trace.
 class BASE_EXPORT TracingAgent {
  public:
   using StartAgentTracingCallback =

content/browser/tracing/etw_system_event_consumer_win.cc → content/browser/tracing/etw_tracing_agent_win.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/browser/tracing/etw_system_event_consumer_win.h"
+#include "content/browser/tracing/etw_tracing_agent_win.h"
 
 #include <stdint.h>
 
@@ -35,22 +35,22 @@ std::string GuidToString(const GUID& guid) {
 
 }  // namespace
 
-EtwSystemEventConsumer::EtwSystemEventConsumer()
+EtwTracingAgent::EtwTracingAgent()
     : thread_("EtwConsumerThread") {
 }
 
-EtwSystemEventConsumer::~EtwSystemEventConsumer() {
+EtwTracingAgent::~EtwTracingAgent() {
 }
 
-std::string EtwSystemEventConsumer::GetTracingAgentName() {
+std::string EtwTracingAgent::GetTracingAgentName() {
   return kETWTracingAgentName;
 }
 
-std::string EtwSystemEventConsumer::GetTraceEventLabel() {
+std::string EtwTracingAgent::GetTraceEventLabel() {
   return kETWTraceLabel;
 }
 
-void EtwSystemEventConsumer::StartAgentTracing(
+void EtwTracingAgent::StartAgentTracing(
     const base::trace_event::TraceConfig& trace_config,
     const StartAgentTracingCallback& callback) {
   // Activate kernel tracing.
@@ -65,7 +65,7 @@ void EtwSystemEventConsumer::StartAgentTracing(
   thread_.Start();
   thread_.message_loop()->PostTask(
       FROM_HERE,
-      base::Bind(&EtwSystemEventConsumer::TraceAndConsumeOnThread,
+      base::Bind(&EtwTracingAgent::TraceAndConsumeOnThread,
                  base::Unretained(this)));
 
   base::ThreadTaskRunnerHandle::Get()->PostTask(
@@ -73,7 +73,7 @@ void EtwSystemEventConsumer::StartAgentTracing(
       base::Bind(callback, GetTracingAgentName(), true /* success */));
 }
 
-void EtwSystemEventConsumer::StopAgentTracing(
+void EtwTracingAgent::StopAgentTracing(
     const StopAgentTracingCallback& callback) {
   // Deactivate kernel tracing.
   if (!StopKernelSessionTracing()) {
@@ -82,12 +82,12 @@ void EtwSystemEventConsumer::StopAgentTracing(
 
   // Stop consuming and flush events.
   thread_.message_loop()->PostTask(FROM_HERE,
-      base::Bind(&EtwSystemEventConsumer::FlushOnThread,
+      base::Bind(&EtwTracingAgent::FlushOnThread,
                  base::Unretained(this),
                  callback));
 }
 
-void EtwSystemEventConsumer::OnStopSystemTracingDone(
+void EtwTracingAgent::OnStopSystemTracingDone(
     const StopAgentTracingCallback& callback,
     const scoped_refptr<base::RefCountedString>& result) {
 
@@ -98,7 +98,7 @@ void EtwSystemEventConsumer::OnStopSystemTracingDone(
   callback.Run(GetTracingAgentName(), GetTraceEventLabel(), result);
 }
 
-bool EtwSystemEventConsumer::StartKernelSessionTracing() {
+bool EtwTracingAgent::StartKernelSessionTracing() {
   // Enabled flags (tracing facilities).
   uint32_t enabled_flags = EVENT_TRACE_FLAG_IMAGE_LOAD |
                            EVENT_TRACE_FLAG_PROCESS | EVENT_TRACE_FLAG_THREAD |
@@ -139,23 +139,23 @@ bool EtwSystemEventConsumer::StartKernelSessionTracing() {
   return true;
 }
 
-bool EtwSystemEventConsumer::StopKernelSessionTracing() {
+bool EtwTracingAgent::StopKernelSessionTracing() {
   HRESULT hr = base::win::EtwTraceController::Stop(
       KERNEL_LOGGER_NAME, &properties_);
   return SUCCEEDED(hr);
 }
 
 // static
-EtwSystemEventConsumer* EtwSystemEventConsumer::GetInstance() {
-  return base::Singleton<EtwSystemEventConsumer>::get();
+EtwTracingAgent* EtwTracingAgent::GetInstance() {
+  return base::Singleton<EtwTracingAgent>::get();
 }
 
 // static
-void EtwSystemEventConsumer::ProcessEvent(EVENT_TRACE* event) {
-  EtwSystemEventConsumer::GetInstance()->AppendEventToBuffer(event);
+void EtwTracingAgent::ProcessEvent(EVENT_TRACE* event) {
+  EtwTracingAgent::GetInstance()->AppendEventToBuffer(event);
 }
 
-void EtwSystemEventConsumer::AddSyncEventToBuffer() {
+void EtwTracingAgent::AddSyncEventToBuffer() {
   // Sync the clocks.
   base::Time walltime = base::Time::NowFromSystemTime();
   base::TimeTicks now = base::TimeTicks::Now();
@@ -181,7 +181,7 @@ void EtwSystemEventConsumer::AddSyncEventToBuffer() {
   events_->Append(value.release());
 }
 
-void EtwSystemEventConsumer::AppendEventToBuffer(EVENT_TRACE* event) {
+void EtwTracingAgent::AppendEventToBuffer(EVENT_TRACE* event) {
   using base::FundamentalValue;
 
   std::unique_ptr<base::DictionaryValue> value(new base::DictionaryValue());
@@ -213,7 +213,7 @@ void EtwSystemEventConsumer::AppendEventToBuffer(EVENT_TRACE* event) {
   events_->Append(value.release());
 }
 
-void EtwSystemEventConsumer::TraceAndConsumeOnThread() {
+void EtwTracingAgent::TraceAndConsumeOnThread() {
   // Create the events buffer.
   events_.reset(new base::ListValue());
 
@@ -227,7 +227,7 @@ void EtwSystemEventConsumer::TraceAndConsumeOnThread() {
   Close();
 }
 
-void EtwSystemEventConsumer::FlushOnThread(
+void EtwTracingAgent::FlushOnThread(
     const StopAgentTracingCallback& callback) {
   // Add the header information to the stream.
   std::unique_ptr<base::DictionaryValue> header(new base::DictionaryValue());
@@ -246,7 +246,7 @@ void EtwSystemEventConsumer::FlushOnThread(
       base::RefCountedString::TakeString(&output);
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
-      base::Bind(&EtwSystemEventConsumer::OnStopSystemTracingDone,
+      base::Bind(&EtwTracingAgent::OnStopSystemTracingDone,
                  base::Unretained(this),
                  callback,
                  result));

content/browser/tracing/etw_system_event_consumer_win.h → content/browser/tracing/etw_tracing_agent_win.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_BROWSER_TRACING_ETW_SYSTEM_EVENT_CONSUMER_WIN_H_
-#define CONTENT_BROWSER_TRACING_ETW_SYSTEM_EVENT_CONSUMER_WIN_H_
+#ifndef CONTENT_BROWSER_TRACING_ETW_TRACING_AGENT_H_
+#define CONTENT_BROWSER_TRACING_ETW_TRACING_AGENT_H_
 
 #include <memory>
 
@@ -23,8 +23,8 @@ struct DefaultSingletonTraits;
 
 namespace content {
 
-class EtwSystemEventConsumer
-    : public base::win::EtwTraceConsumerBase<EtwSystemEventConsumer>,
+class EtwTracingAgent
+    : public base::win::EtwTraceConsumerBase<EtwTracingAgent>,
       public base::trace_event::TracingAgent {
  public:
   // base::trace_event::TracingAgent implementation.
@@ -35,23 +35,23 @@ class EtwSystemEventConsumer
   void StopAgentTracing(const StopAgentTracingCallback& callback) override;
 
   // Retrieve the ETW consumer instance.
-  static EtwSystemEventConsumer* GetInstance();
+  static EtwTracingAgent* GetInstance();
 
  private:
   // This allows constructor and destructor to be private and usable only
   // by the Singleton class.
-  friend struct base::DefaultSingletonTraits<EtwSystemEventConsumer>;
+  friend struct base::DefaultSingletonTraits<EtwTracingAgent>;
 
   // Constructor.
-  EtwSystemEventConsumer();
-  ~EtwSystemEventConsumer() override;
+  EtwTracingAgent();
+  ~EtwTracingAgent() override;
 
   void AddSyncEventToBuffer();
   void AppendEventToBuffer(EVENT_TRACE* event);
 
   // Static override of EtwTraceConsumerBase::ProcessEvent.
   // @param event the raw ETW event to process.
-  friend class base::win::EtwTraceConsumerBase<EtwSystemEventConsumer>;
+  friend class base::win::EtwTraceConsumerBase<EtwTracingAgent>;
   static void ProcessEvent(EVENT_TRACE* event);
 
   // Request the ETW trace controller to activate the kernel tracing.
@@ -75,9 +75,9 @@ class EtwSystemEventConsumer
   TRACEHANDLE session_handle_;
   base::win::EtwTraceProperties properties_;
 
-  DISALLOW_COPY_AND_ASSIGN(EtwSystemEventConsumer);
+  DISALLOW_COPY_AND_ASSIGN(EtwTracingAgent);
 };
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_TRACING_ETW_SYSTEM_EVENT_CONSUMER_WIN_H_
+#endif  // CONTENT_BROWSER_TRACING_ETW_TRACING_AGENT_H_

content/browser/tracing/tracing_controller_impl.cc

@@ -46,7 +46,7 @@
 #endif
 
 #if defined(OS_WIN)
-#include "content/browser/tracing/etw_system_event_consumer_win.h"
+#include "content/browser/tracing/etw_tracing_agent_win.h"
 #endif
 
 using base::trace_event::TraceLog;
@@ -279,7 +279,7 @@ bool TracingControllerImpl::StartTracing(
       ++pending_start_tracing_ack_count_;
     }
 #elif defined(OS_WIN)
-    EtwSystemEventConsumer::GetInstance()->StartAgentTracing(
+    EtwTracingAgent::GetInstance()->StartAgentTracing(
         trace_config,
         base::Bind(&TracingControllerImpl::OnStartAgentTracingAcked,
                    base::Unretained(this)));
@@ -586,7 +586,7 @@ void TracingControllerImpl::AddTracingAgent(const std::string& agent_name) {
     return;
   }
 #elif defined(OS_WIN)
-  auto etw_agent = EtwSystemEventConsumer::GetInstance();
+  auto etw_agent = EtwTracingAgent::GetInstance();
   if (agent_name == etw_agent->GetTracingAgentName()) {
     additional_tracing_agents_.push_back(etw_agent);
     return;

content/content_browser.gypi

@@ -1575,8 +1575,8 @@
       'browser/tracing/background_tracing_manager_impl.h',
       'browser/tracing/background_tracing_rule.cc',
       'browser/tracing/background_tracing_rule.h',
-      'browser/tracing/etw_system_event_consumer_win.cc',
-      'browser/tracing/etw_system_event_consumer_win.h',
+      'browser/tracing/etw_tracing_agent_win.cc',
+      'browser/tracing/etw_tracing_agent_win.h',
       'browser/tracing/file_tracing_provider_impl.cc',
       'browser/tracing/file_tracing_provider_impl.h',
       'browser/tracing/trace_message_filter.cc',