Add a |scope| argument to TRACE_EVENT_INSTANT* and require its presence.

content/common/android/trace_event_binding.cc

 // Copyright (c) 2012 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 "content/common/android/trace_event_binding.h"
 
 #include <jni.h>
 
 #include <set>
 
@@ skipping 71 matching lines @@
 
 static void StopATrace(JNIEnv* env, jclass clazz) {
   base::debug::TraceLog::GetInstance()->StopATrace();
 }
 
 static void Instant(JNIEnv* env, jclass clazz,
                     jstring jname, jstring jarg) {
   TraceEventDataConverter converter(env, jname, jarg);
   if (converter.arg()) {
     TRACE_EVENT_COPY_INSTANT1(kJavaCategory, converter.name(),
+                              TRACE_EVENT_SCOPE_THREAD,
                               converter.arg_name(), converter.arg());
   } else {
-    TRACE_EVENT_COPY_INSTANT0(kJavaCategory, converter.name());
+    TRACE_EVENT_COPY_INSTANT0(kJavaCategory, converter.name(),
+                              TRACE_EVENT_SCOPE_THREAD);
   }
 }
 
 static void Begin(JNIEnv* env, jclass clazz,
                   jstring jname, jstring jarg) {
   TraceEventDataConverter converter(env, jname, jarg);
   if (converter.arg()) {
     TRACE_EVENT_COPY_BEGIN1(kJavaCategory, converter.name(),
                        converter.arg_name(), converter.arg());
   } else {
@@ skipping 40 matching lines @@
   } else {
     TRACE_EVENT_COPY_ASYNC_END0(kJavaCategory,
                                 converter.name(),
                                 converter.id());
   }
 }
 
 bool RegisterTraceEvent(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }