Merge cherrypicks of ['googleplex-android-review.googlesource.com/23779980'] into udc-release.
Change-Id: I14209fa74abd4363e145eb98924795395b18febc
diff --git a/test/ftrace_integrationtest.cc b/test/ftrace_integrationtest.cc
index ae1b104..7fb8ea0 100644
--- a/test/ftrace_integrationtest.cc
+++ b/test/ftrace_integrationtest.cc
@@ -305,7 +305,7 @@
ds_config->set_name("linux.ftrace");
protos::gen::FtraceConfig ftrace_config;
- ftrace_config.add_ftrace_events("sched/sched_process_fork"); // Good.
+ ftrace_config.add_ftrace_events("sched/sched_switch"); // Good.
ftrace_config.add_ftrace_events("sched/does_not_exist"); // Bad.
ftrace_config.add_ftrace_events("foobar/i_just_made_this_up"); // Bad.
ftrace_config.add_atrace_categories("madeup_atrace_cat"); // Bad.