Revert "Reland "[mac] Enable perfetto client library""
This reverts commitd9c94f21f1
. Reason for revert: SystemTracingEndToEndBrowserTest.PerformanceMark is failing: https://ci.chromium.org/ui/p/chromium/builders/ci/mac13-arm64-rel-tests/16019/overview Original change's description: > Reland "[mac] Enable perfetto client library" > > This is a reland of commitc9f979ce20
> Reason for revert: crbug.com/1524099 > Fix: > - ScopedMLTraceTest handle 'n' (Instant async event) as begin/end > - SystemTracingEndToEndBrowserTest.PerformanceMark: increase connect > timeout. > > > Original change's description: > > [mac] Enable perfetto client library > > > > This uses new TRACE_EVENT* macro implemented in perfetto. > > This was previously tried and reverted at06e237b24d
> > The underlying issue crbug.com/1479357 should be fixed. > > > > Bug: 1006541 > > Change-Id: Iddebd6e40da79a302eacb3e5643a01e17813ef48 > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5245869 > > Reviewed-by: Eric Seckler <eseckler@chromium.org> > > Reviewed-by: Dirk Pranke <dpranke@google.com> > > Commit-Queue: Etienne Pierre-Doray <etiennep@chromium.org> > > Cr-Commit-Position: refs/heads/main@{#1255112} > > Bug: 1006541, 1524099 > Change-Id: I174c72e7091a20cc758870461a4d83e37fc19281 > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5258709 > Reviewed-by: Dirk Pranke <dpranke@google.com> > Owners-Override: Dirk Pranke <dpranke@google.com> > Reviewed-by: Eric Seckler <eseckler@chromium.org> > Commit-Queue: Etienne Pierre-Doray <etiennep@chromium.org> > Cr-Commit-Position: refs/heads/main@{#1256340} Bug: 1006541, 1524099 Change-Id: Ia614651cfbcb104f8ebbb1533492835c07fafca1 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5270594 Commit-Queue: Kevin Grosu <kgrosu@google.com> Owners-Override: Kevin Grosu <kgrosu@google.com> Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Cr-Commit-Position: refs/heads/main@{#1256441}
This commit is contained in:

committed by
Chromium LUCI CQ

parent
814a79b5d1
commit
b394312b3b
build_overrides
content/browser/tracing
third_party/blink/renderer/modules/ml
@ -40,7 +40,7 @@ declare_args() {
|
||||
# TODO(crbug/1006541): Switch to perfetto's client library on all platforms.
|
||||
use_perfetto_client_library =
|
||||
(is_linux || is_android || (use_blink && is_ios) || is_win ||
|
||||
is_chromeos || is_mac) && !is_castos
|
||||
is_chromeos) && !is_castos
|
||||
|
||||
# Limits the defined //third_party/android_deps targets to only "buildCompile"
|
||||
# and "buildCompileNoDeps" targets. This is useful for third-party
|
||||
|
@ -572,8 +572,7 @@ IN_PROC_BROWSER_TEST_F(SystemTracingEndToEndBrowserTest, PerformanceMark) {
|
||||
// connecting to the service), but it doesn't matter. We just want to make
|
||||
// sure that at least one of them is there.
|
||||
std::vector<char> trace;
|
||||
size_t i = 0;
|
||||
for (; i < 300; i++) {
|
||||
for (size_t i = 0; i < 100; i++) {
|
||||
EXPECT_TRUE(ExecJs(tab, "performance.mark('mark1');"));
|
||||
|
||||
base::RunLoop flush;
|
||||
@ -589,7 +588,6 @@ IN_PROC_BROWSER_TEST_F(SystemTracingEndToEndBrowserTest, PerformanceMark) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
ASSERT_LT(i, 300U);
|
||||
|
||||
base::test::TestTraceProcessorImpl ttp;
|
||||
absl::Status status = ttp.ParseTrace(trace);
|
||||
|
@ -86,10 +86,7 @@ class ScopedMLTraceTest : public testing::Test {
|
||||
const std::string* trace_type = dict.FindString("ph");
|
||||
CHECK(trace_type);
|
||||
// Count both the "BEGIN" and "END" traces.
|
||||
if (*trace_type == "n") {
|
||||
((event_counts)[*name].first)++;
|
||||
((event_counts)[*name].second)++;
|
||||
} else if (*trace_type != "E" && *trace_type != "e") {
|
||||
if (*trace_type != "E" && *trace_type != "e") {
|
||||
((event_counts)[*name].first)++;
|
||||
} else {
|
||||
((event_counts)[*name].second)++;
|
||||
|
Reference in New Issue
Block a user