Merge "Revert "Disable HeapprofdEndToEnd and HeapprofdCtsTest.""

src/profiling/memory/heapprofd_end_to_end_test.cc

diff --git a/src/profiling/memory/heapprofd_end_to_end_test.cc b/src/profiling/memory/heapprofd_end_to_end_test.cc
index 6e7df6f..f7856f4 100644
--- a/src/profiling/memory/heapprofd_end_to_end_test.cc
+++ b/src/profiling/memory/heapprofd_end_to_end_test.cc
@@ -952,8 +952,7 @@
     PERFETTO_BUILDFLAG(PERFETTO_START_DAEMONS)
 INSTANTIATE_TEST_CASE_P(DISABLED_Run, HeapprofdEndToEnd, Bool(), TestSuffix);
 #else
-// TODO(b/150085813): Re-enable this once it is fixed.
-INSTANTIATE_TEST_CASE_P(DISABLED_Run, HeapprofdEndToEnd, Bool(), TestSuffix);
+INSTANTIATE_TEST_CASE_P(Run, HeapprofdEndToEnd, Bool(), TestSuffix);
 #endif
 
 }  // namespace

test/cts/heapprofd_test_cts.cc

diff --git a/test/cts/heapprofd_test_cts.cc b/test/cts/heapprofd_test_cts.cc
index f5e3494..2933282 100644
--- a/test/cts/heapprofd_test_cts.cc
+++ b/test/cts/heapprofd_test_cts.cc
@@ -167,40 +167,35 @@
   }
 }
 
-// TODO(b/150085813): Re-enable this once it is fixed.
-TEST(DISABLED_HeapprofdCtsTest, DebuggableAppRuntime) {
+TEST(HeapprofdCtsTest, DebuggableAppRuntime) {
   std::string app_name = "android.perfetto.cts.app.debuggable";
   const auto& packets = ProfileRuntime(app_name);
   AssertExpectedAllocationsPresent(packets);
   StopApp(app_name);
 }
 
-// TODO(b/150085813): Re-enable this once it is fixed.
-TEST(DISABLED_HeapprofdCtsTest, DebuggableAppStartup) {
+TEST(HeapprofdCtsTest, DebuggableAppStartup) {
   std::string app_name = "android.perfetto.cts.app.debuggable";
   const auto& packets = ProfileStartup(app_name);
   AssertExpectedAllocationsPresent(packets);
   StopApp(app_name);
 }
 
-// TODO(b/150085813): Re-enable this once it is fixed.
-TEST(DISABLED_HeapprofdCtsTest, ProfileableAppRuntime) {
+TEST(HeapprofdCtsTest, ProfileableAppRuntime) {
   std::string app_name = "android.perfetto.cts.app.profileable";
   const auto& packets = ProfileRuntime(app_name);
   AssertExpectedAllocationsPresent(packets);
   StopApp(app_name);
 }
 
-// TODO(b/150085813): Re-enable this once it is fixed.
-TEST(DISABLED_HeapprofdCtsTest, ProfileableAppStartup) {
+TEST(HeapprofdCtsTest, ProfileableAppStartup) {
   std::string app_name = "android.perfetto.cts.app.profileable";
   const auto& packets = ProfileStartup(app_name);
   AssertExpectedAllocationsPresent(packets);
   StopApp(app_name);
 }
 
-// TODO(b/150085813): Re-enable this once it is fixed.
-TEST(DISABLED_HeapprofdCtsTest, ReleaseAppRuntime) {
+TEST(HeapprofdCtsTest, ReleaseAppRuntime) {
   std::string app_name = "android.perfetto.cts.app.release";
   const auto& packets = ProfileRuntime(app_name);
 
@@ -212,8 +207,7 @@
   StopApp(app_name);
 }
 
-// TODO(b/150085813): Re-enable this once it is fixed.
-TEST(DISABLED_HeapprofdCtsTest, ReleaseAppStartup) {
+TEST(HeapprofdCtsTest, ReleaseAppStartup) {
   std::string app_name = "android.perfetto.cts.app.release";
   const auto& packets = ProfileStartup(app_name);