Update from https://crrev.com/333737

sky/shell/android/tracing_controller.cc

Index: sky/shell/android/tracing_controller.cc
diff --git a/sky/shell/android/tracing_controller.cc b/sky/shell/android/tracing_controller.cc
index ba2abdd5d2f67cc65074dc6ac10e8f51b34c0e17..d9b55c51edca37754fd175d487990762b6165fb5 100644
--- a/sky/shell/android/tracing_controller.cc
+++ b/sky/shell/android/tracing_controller.cc
@@ -8,6 +8,7 @@
 #include "base/android/jni_string.h"
 #include "base/files/file_util.h"
 #include "base/macros.h"
+#include "base/trace_event/trace_config.h"
 #include "base/trace_event/trace_event.h"
 #include "jni/TracingController_jni.h"
 
@@ -45,9 +46,8 @@ static void StartTracing(JNIEnv* env, jclass clazz) {
   LOG(INFO) << "Starting trace";
 
   base::trace_event::TraceLog::GetInstance()->SetEnabled(
-      base::trace_event::CategoryFilter("*"),
-      base::trace_event::TraceLog::RECORDING_MODE,
-      base::trace_event::TraceOptions(base::trace_event::RECORD_UNTIL_FULL));
+      base::trace_event::TraceConfig("*", base::trace_event::RECORD_UNTIL_FULL),
+      base::trace_event::TraceLog::RECORDING_MODE);
 }
 
 static void StopTracing(JNIEnv* env, jclass clazz, jstring path) {