Fix CHECK on startup when running with --trace-startup=mojom (see issue #2622).
This commit is contained in:
parent
9ce29e8ec5
commit
941d53ebfd
|
@ -416,5 +416,11 @@ patches = [
|
|||
# Windows: Revert base::Value change which breaks cef_sandbox build.
|
||||
# https://bugs.chromium.org/p/chromium/issues/detail?id=646113#c173
|
||||
'name': 'base_value_646113',
|
||||
},
|
||||
{
|
||||
# Fix CHECK on startup when running with --trace-startup=mojom.
|
||||
# This change can be removed once we bump Chromium past the following:
|
||||
# https://bugs.chromium.org/p/chromium/issues/detail?id=839084#c60
|
||||
'name': 'services_tracing_839084',
|
||||
}
|
||||
]
|
||||
|
|
|
@ -0,0 +1,24 @@
|
|||
diff --git services/tracing/public/cpp/tracing_features.cc services/tracing/public/cpp/tracing_features.cc
|
||||
index 08887d9243d6..c098a44cf1ad 100644
|
||||
--- services/tracing/public/cpp/tracing_features.cc
|
||||
+++ services/tracing/public/cpp/tracing_features.cc
|
||||
@@ -34,9 +34,16 @@ const base::Feature kTracingServiceInProcess {
|
||||
namespace tracing {
|
||||
|
||||
bool TracingUsesPerfettoBackend() {
|
||||
- return base::CommandLine::ForCurrentProcess()->HasSwitch(
|
||||
- switches::kEnablePerfetto) ||
|
||||
- base::FeatureList::IsEnabled(features::kTracingPerfettoBackend);
|
||||
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
|
||||
+ switches::kEnablePerfetto)) {
|
||||
+ return true;
|
||||
+ }
|
||||
+
|
||||
+ if (base::FeatureList::GetInstance()) {
|
||||
+ return base::FeatureList::IsEnabled(features::kTracingPerfettoBackend);
|
||||
+ }
|
||||
+
|
||||
+ return false;
|
||||
}
|
||||
|
||||
} // namespace tracing
|
Loading…
Reference in New Issue