Update from https://crrev.com/316786

base/android/trace_event_binding.cc

 // Copyright 2014 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/android/trace_event_binding.h"
 
 #include <jni.h>
 
 #include <set>
 
@@ skipping 37 matching lines @@
  private:
   JNIEnv* env_;
   jstring jname_;
   jstring jarg_;
   const char* name_;
   const char* arg_;
 
   DISALLOW_COPY_AND_ASSIGN(TraceEventDataConverter);
 };
 
-class TraceEnabledObserver : public debug::TraceLog::EnabledStateObserver {
+class TraceEnabledObserver
+    : public trace_event::TraceLog::EnabledStateObserver {
   public:
    void OnTraceLogEnabled() override {
       JNIEnv* env = base::android::AttachCurrentThread();
       base::android::Java_TraceEvent_setEnabled(env, true);
     }
     void OnTraceLogDisabled() override {
       JNIEnv* env = base::android::AttachCurrentThread();
       base::android::Java_TraceEvent_setEnabled(env, false);
     }
 };
 
 base::LazyInstance<TraceEnabledObserver>::Leaky g_trace_enabled_state_observer_;
 
 }  // namespace
 
 static void RegisterEnabledObserver(JNIEnv* env, jclass clazz) {
-  bool enabled = debug::TraceLog::GetInstance()->IsEnabled();
+  bool enabled = trace_event::TraceLog::GetInstance()->IsEnabled();
   base::android::Java_TraceEvent_setEnabled(env, enabled);
-  debug::TraceLog::GetInstance()->AddEnabledStateObserver(
+  trace_event::TraceLog::GetInstance()->AddEnabledStateObserver(
       g_trace_enabled_state_observer_.Pointer());
 }
 
 static void StartATrace(JNIEnv* env, jclass clazz) {
-  base::debug::TraceLog::GetInstance()->StartATrace();
+  base::trace_event::TraceLog::GetInstance()->StartATrace();
 }
 
 static void StopATrace(JNIEnv* env, jclass clazz) {
-  base::debug::TraceLog::GetInstance()->StopATrace();
+  base::trace_event::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 {
@@ skipping 41 matching lines @@
   TraceEventDataConverter converter(env, jname, nullptr);
   TRACE_EVENT_COPY_ASYNC_END0(kJavaCategory, converter.name(), jid);
 }
 
 bool RegisterTraceEvent(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android
 }  // namespace base