diff options
Diffstat (limited to 'chromium/components/tracing/common')
| -rw-r--r-- | chromium/components/tracing/common/graphics_memory_dump_provider_android.cc | 1 | ||||
| -rw-r--r-- | chromium/components/tracing/common/trace_startup_config.cc | 9 |
2 files changed, 5 insertions, 5 deletions
diff --git a/chromium/components/tracing/common/graphics_memory_dump_provider_android.cc b/chromium/components/tracing/common/graphics_memory_dump_provider_android.cc index 40c22421b39..9927d06cf92 100644 --- a/chromium/components/tracing/common/graphics_memory_dump_provider_android.cc +++ b/chromium/components/tracing/common/graphics_memory_dump_provider_android.cc @@ -13,6 +13,7 @@ #include <sys/un.h> #include "base/files/scoped_file.h" +#include "base/logging.h" #include "base/posix/eintr_wrapper.h" #include "base/stl_util.h" #include "base/strings/strcat.h" diff --git a/chromium/components/tracing/common/trace_startup_config.cc b/chromium/components/tracing/common/trace_startup_config.cc index 25412258500..c666cea5560 100644 --- a/chromium/components/tracing/common/trace_startup_config.cc +++ b/chromium/components/tracing/common/trace_startup_config.cc @@ -38,13 +38,12 @@ const base::FilePath::CharType kAndroidTraceConfigFile[] = FILE_PATH_LITERAL("/data/local/chrome-trace-config.json"); const char kDefaultStartupCategories[] = - "startup,browser,toplevel,disabled-by-default-toplevel.flow,ipc,EarlyJava," - "cc,Java,navigation,loading,gpu,disabled-by-default-cpu_profiler,download_" - "service,-*"; + "startup,browser,toplevel,toplevel.flow,ipc,EarlyJava,cc,Java,navigation," + "loading,gpu,disabled-by-default-cpu_profiler,download_service,-*"; #else const char kDefaultStartupCategories[] = - "benchmark,toplevel,startup,disabled-by-default-file,disabled-by-default-" - "toplevel.flow,download_service,-*"; + "benchmark,toplevel,startup,disabled-by-default-file,toplevel.flow," + "download_service,-*"; #endif // String parameters that can be used to parse the trace config file content. |