Remove remaining references to BattOr tracing

This is a follow-up to https://crrev.com/c/1122489, which removed
the BattOr PowerTracingAgent from Chrome.

R=oysteine@chromium.org, dcheng@chromium.org

Bug: 859514
Change-Id: Ib4324289fcf9d1d0e3d34f828550a488a694644b
Reviewed-on: https://chromium-review.googlesource.com/1162626
Commit-Queue: Charlie Andrews <charliea@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: oysteine <oysteine@chromium.org>
Cr-Commit-Position: refs/heads/master@{#580678}

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, EtwTracingAgent for Windows system
-// trace and PowerTracingAgent for BattOr power trace.
+// DebugDaemonClient for CrOs system trace, and EtwTracingAgent for Windows
+// system.
 class BASE_EXPORT TracingAgent {
  public:
   using StartAgentTracingCallback =

content/browser/tracing/DEPS

 include_rules = [
   # Generated by the local tracing_resources.gyp:tracing_resources
   "+grit/tracing_resources.h",
-  "+tools/battor_agent",
 ]
 
 specific_include_rules = {

services/tracing/coordinator.cc

@@ -117,11 +117,12 @@ class Coordinator::TraceStreamer : public base::SupportsWeakPtr<TraceStreamer> {
     // Bail out if we are in the middle of writing events for another label to
     // the stream, since we do not want to interleave chunks for different
     // fields. For example, we do not want to mix |traceEvent| chunks with
-    // |battor| chunks.
+    // |systrace| chunks.
     //
-    // If we receive a |battor| chunk from an agent while writing |traceEvent|
-    // chunks to the stream, we wait until all agents that send |traceEvent|
-    // chunks are done, and then, we start writing |battor| chunks.
+    // If we receive a |systemTraceEvents| chunk from an agent while writing
+    // |traceEvent| chunks to the stream, we wait until all agents that send
+    // |traceEvent| chunks are done, and then, we start writing
+    // |systemTraceEvents| chunks.
     if (!streaming_label_.empty() && streaming_label_ != label)
       return;
 

services/tracing/coordinator_unittest.cc

@@ -69,7 +69,7 @@ class CoordinatorTest : public testing::Test,
 
   MockAgent* AddStringAgent() {
     auto agent = std::make_unique<MockAgent>();
-    agent_registry_->RegisterAgent(agent->CreateAgentPtr(), "battor",
+    agent_registry_->RegisterAgent(agent->CreateAgentPtr(), "power",
                                    mojom::TraceDataType::STRING, false,
                                    base::kNullProcessId);
     agents_.push_back(std::move(agent));
@@ -325,8 +325,8 @@ TEST_F(CoordinatorTest, StopAndFlushDifferentTypeAgents) {
   if (!quit_closure_.is_null())
     run_loop.Run();
 
-  EXPECT_TRUE(output_ == "{\"traceEvents\":[e1,e2],\"battor\":\"e3e4\"}" ||
-              output_ == "{\"battor\":\"e3e4\",\"traceEvents\":[e1,e2]}");
+  EXPECT_TRUE(output_ == "{\"traceEvents\":[e1,e2],\"power\":\"e3e4\"}" ||
+              output_ == "{\"power\":\"e3e4\",\"traceEvents\":[e1,e2]}");
 
   // Each agent should have received exactly two calls.
   EXPECT_EQ(2u, agent1->call_stat().size());

services/tracing/public/mojom/tracing.mojom

@@ -21,8 +21,8 @@ enum TraceDataType {
   STRING
 };
 
-// Tracing agents, like |chrome|, |etw|, |battor|, and |cros|, use this
-// interface to register themselves to the tracing service.
+// Tracing agents, like |chrome|, |etw|, and |cros|, use this interface to
+// register themselves to the tracing service.
 //
 // This is a separate interface from |Coordinator| for security and privacy
 // reasons: although we want to let almost every process be able to send tracing