Telemetry: Remove unnessessary 'benchmark' traces.

We're moving towards 'benchmark' being only for traces that
are actually read by benchmarks, rather that part of
benchmarks. This changes several to 'input'. One is read by a
benchmark, so that is now 'input,benchmark'.

BUG=344765

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255318 0039d316-1c4b-4281-b951-d872f2087c98

content/browser/renderer_host/input/synthetic_gesture_controller.cc

@@ -32,7 +32,7 @@ void SyntheticGestureController::QueueSyntheticGesture(
 }
 
 void SyntheticGestureController::Flush(base::TimeTicks timestamp) {
-  TRACE_EVENT0("benchmark", "SyntheticGestureController::Flush");
+  TRACE_EVENT0("input", "SyntheticGestureController::Flush");
   if (pending_gesture_queue_.IsEmpty())
     return;
 
@@ -53,7 +53,8 @@ void SyntheticGestureController::Flush(base::TimeTicks timestamp) {
 }
 
 void SyntheticGestureController::StartGesture(const SyntheticGesture& gesture) {
-  TRACE_EVENT_ASYNC_BEGIN0("benchmark", "SyntheticGestureController::running",
+  TRACE_EVENT_ASYNC_BEGIN0("input,benchmark",
+                           "SyntheticGestureController::running",
                            &gesture);
   gesture_target_->SetNeedsFlush();
 }
@@ -63,7 +64,8 @@ void SyntheticGestureController::StopGesture(
     const OnGestureCompleteCallback& completion_callback,
     SyntheticGesture::Result result) {
   DCHECK_NE(result, SyntheticGesture::GESTURE_RUNNING);
-  TRACE_EVENT_ASYNC_END0("benchmark", "SyntheticGestureController::running",
+  TRACE_EVENT_ASYNC_END0("input,benchmark",
+                         "SyntheticGestureController::running",
                          &gesture);
 
   completion_callback.Run(result);

content/browser/renderer_host/input/synthetic_gesture_target_android.cc

@@ -32,14 +32,14 @@ bool SyntheticGestureTargetAndroid::RegisterTouchEventSynthesizer(JNIEnv* env) {
 
 void SyntheticGestureTargetAndroid::TouchSetPointer(
     JNIEnv* env, int index, int x, int y, int id) {
-  TRACE_EVENT0("benchmark", "SyntheticGestureTargetAndroid::TouchSetPointer");
+  TRACE_EVENT0("input", "SyntheticGestureTargetAndroid::TouchSetPointer");
   Java_TouchEventSynthesizer_setPointer(env, touch_event_synthesizer_.obj(),
                                       index, x, y, id);
 }
 
 void SyntheticGestureTargetAndroid::TouchInject(
     JNIEnv* env, Action action, int pointer_count, int64 time_in_ms) {
-  TRACE_EVENT0("benchmark", "SyntheticGestureTargetAndroid::TouchInject");
+  TRACE_EVENT0("input", "SyntheticGestureTargetAndroid::TouchInject");
   Java_TouchEventSynthesizer_inject(env, touch_event_synthesizer_.obj(),
                                     static_cast<int>(action), pointer_count,
                                     time_in_ms);

content/browser/renderer_host/input/synthetic_gesture_target_base.cc

@@ -42,7 +42,7 @@ SyntheticGestureTargetBase::~SyntheticGestureTargetBase() {
 
 void SyntheticGestureTargetBase::DispatchInputEventToPlatform(
     const WebInputEvent& event) {
-  TRACE_EVENT1("benchmark",
+  TRACE_EVENT1("input",
                "SyntheticGestureTarget::DispatchInputEventToPlatform",
                "type", WebInputEventTraits::GetName(event.type));