Snap for 11135477 from f054515492af5132f685cb23fe11891ee77104c9 to 24Q1-releaseandroid-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release

Change-Id: I018123259cd231d0e74933e492391999e36650e8

1 files changed, 8 insertions, 12 deletions

diff --git a/pw_allocator/allocator_metric_proxy_test.cc b/pw_allocator/allocator_metric_proxy_test.cc
index e426349a9..cfc94b2f0 100644
--- a/pw_allocator/allocator_metric_proxy_test.cc
+++ b/pw_allocator/allocator_metric_proxy_test.cc
@@ -15,27 +15,23 @@
 #include "pw_allocator/allocator_metric_proxy.h"
 
 #include "gtest/gtest.h"
-#include "pw_allocator_private/allocator_testing.h"
+#include "pw_allocator/allocator_testing.h"
 
 namespace pw::allocator {
 namespace {
 
 // Test fixtures.
 
-struct AllocatorMetricProxyTest : ::testing::Test {
- private:
-  std::array<std::byte, 256> buffer = {};
-  test::FakeAllocator wrapped;
+class AllocatorMetricProxyTest : public ::testing::Test {
+ protected:
+  AllocatorMetricProxyTest() : allocator(0) {}
 
- public:
-  AllocatorMetricProxy allocator;
+  void SetUp() override { allocator.Initialize(*wrapped); }
 
-  AllocatorMetricProxyTest() : allocator(0) {}
+  AllocatorMetricProxy allocator;
 
-  void SetUp() override {
-    EXPECT_TRUE(wrapped.Initialize(buffer).ok());
-    allocator.Initialize(wrapped);
-  }
+ private:
+  test::AllocatorForTestWithBuffer<256> wrapped;
 };
 
 // Unit tests.