Revert of Add more trace events to "benchmark" category

ui/events/latency_info.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/debug/trace_event.h"
 #include "base/json/json_writer.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/stringprintf.h"
 #include "ui/events/latency_info.h"
 
@@ skipping 234 matching lines @@
         ts = base::TimeTicks::NowFromSystemTraceTime().ToInternalValue();
       }
       TRACE_EVENT_ASYNC_BEGIN_WITH_TIMESTAMP0(
           "benchmark",
           "InputLatency",
           TRACE_ID_DONT_MANGLE(trace_id),
           ts);
     }
 
     TRACE_EVENT_FLOW_BEGIN0(
-        "input,benchmark", "LatencyInfo.Flow", TRACE_ID_DONT_MANGLE(trace_id));
+        "input", "LatencyInfo.Flow", TRACE_ID_DONT_MANGLE(trace_id));
   }
 
   LatencyMap::key_type key = std::make_pair(component, id);
   LatencyMap::iterator it = latency_components.find(key);
   if (it == latency_components.end()) {
     LatencyComponent info = {component_sequence_number, time, event_count};
     latency_components[key] = info;
   } else {
     it->second.sequence_number = std::max(component_sequence_number,
                                           it->second.sequence_number);
@@ skipping 14 matching lines @@
     terminated = true;
 
     if (*benchmark_enabled) {
       TRACE_EVENT_ASYNC_END1("benchmark",
                              "InputLatency",
                              TRACE_ID_DONT_MANGLE(trace_id),
                              "data", AsTraceableData(*this));
     }
 
     TRACE_EVENT_FLOW_END0(
-        "input,benchmark", "LatencyInfo.Flow", TRACE_ID_DONT_MANGLE(trace_id));
+        "input", "LatencyInfo.Flow", TRACE_ID_DONT_MANGLE(trace_id));
   }
 }
 
 bool LatencyInfo::FindLatency(LatencyComponentType type,
                               int64 id,
                               LatencyComponent* output) const {
   LatencyMap::const_iterator it = latency_components.find(
       std::make_pair(type, id));
   if (it == latency_components.end())
     return false;
@@ skipping 20 matching lines @@
 }
 
 void LatencyInfo::TraceEventType(const char* event_type) {
   TRACE_EVENT_ASYNC_STEP_INTO0("benchmark",
                                "InputLatency",
                                TRACE_ID_DONT_MANGLE(trace_id),
                                event_type);
 }
 
 }  // namespace ui