commit 6a2a99286db4a416a0ad17878b591539c34c9afc
author Treehugger Robot <treehugger-gerrit@google.com> Mon Feb 05 15:14:27 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Feb 05 15:14:27 2018 +0000
tree 118e93212f9b168218453b5bc68461c74b407e2c
parent 6e45e48ca3aa2bfea12c6682f981ffe29e75e934
parent dbdec97cf703de9b09d72e992d27e0852788c968

Merge "ftrace_reader: Kernel buffer size follow up"

include/perfetto/base/task_runner.h

diff --git a/include/perfetto/base/task_runner.h b/include/perfetto/base/task_runner.h
index 1cb5181..d7e1919 100644
--- a/include/perfetto/base/task_runner.h
+++ b/include/perfetto/base/task_runner.h
@@ -18,6 +18,7 @@
 #define INCLUDE_PERFETTO_BASE_TASK_RUNNER_H_
 
 #include <functional>
+#include "perfetto/base/build_config.h"
 #include "perfetto/base/watchdog.h"
 
 namespace perfetto {
@@ -65,7 +66,9 @@
 
  protected:
   static void RunTask(const std::function<void()>& task) {
+#if !BUILDFLAG(PERFETTO_CHROMIUM_BUILD)
     base::WatchDog w(kWatchdogMillis);
+#endif
     task();
   }
 };