From 644c8cca3c79552e65573de09755a32188792d37 Mon Sep 17 00:00:00 2001
From: Aaron Clarke <aaclarke@google.com>
Date: Thu, 25 Feb 2021 14:54:34 -0800
Subject: [PATCH 1/2] Changed clearing out the threadhost with removing a
 reference to the threadhost.

---
 shell/common/thread_host.cc                    | 2 +-
 shell/common/thread_host.h                     | 2 +-
 shell/platform/android/android_shell_holder.cc | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/shell/common/thread_host.cc b/shell/common/thread_host.cc
index fdae202a53cce..cc5931f59207b 100644
--- a/shell/common/thread_host.cc
+++ b/shell/common/thread_host.cc
@@ -35,7 +35,7 @@ ThreadHost::ThreadHost(std::string name_prefix_arg, uint64_t mask)
 
 ThreadHost::~ThreadHost() = default;
 
-void ThreadHost::Reset() {
+void ThreadHost::ResetThreads() {
   platform_thread.reset();
   ui_thread.reset();
   raster_thread.reset();
diff --git a/shell/common/thread_host.h b/shell/common/thread_host.h
index c5db31938563e..fc79a71c534b0 100644
--- a/shell/common/thread_host.h
+++ b/shell/common/thread_host.h
@@ -39,7 +39,7 @@ struct ThreadHost {
 
   ~ThreadHost();
 
-  void Reset();
+  void ResetThreads();
 };
 
 }  // namespace flutter
diff --git a/shell/platform/android/android_shell_holder.cc b/shell/platform/android/android_shell_holder.cc
index 6a71c24e232fa..6e17072a6edde 100644
--- a/shell/platform/android/android_shell_holder.cc
+++ b/shell/platform/android/android_shell_holder.cc
@@ -170,7 +170,7 @@ AndroidShellHolder::AndroidShellHolder(
 
 AndroidShellHolder::~AndroidShellHolder() {
   shell_.reset();
-  thread_host_->Reset();
+  thread_host_.reset();
 }
 
 bool AndroidShellHolder::IsValid() const {

From 0633236638bbad04882b6e3fe9a74a84a486bb6c Mon Sep 17 00:00:00 2001
From: Aaron Clarke <aaclarke@google.com>
Date: Thu, 25 Feb 2021 16:29:04 -0800
Subject: [PATCH 2/2] deleted the ResetThreads method because I don't think
 anyone is using it.

---
 shell/common/thread_host.cc | 8 --------
 shell/common/thread_host.h  | 2 --
 2 files changed, 10 deletions(-)

diff --git a/shell/common/thread_host.cc b/shell/common/thread_host.cc
index cc5931f59207b..2e0d539fa82f0 100644
--- a/shell/common/thread_host.cc
+++ b/shell/common/thread_host.cc
@@ -35,12 +35,4 @@ ThreadHost::ThreadHost(std::string name_prefix_arg, uint64_t mask)
 
 ThreadHost::~ThreadHost() = default;
 
-void ThreadHost::ResetThreads() {
-  platform_thread.reset();
-  ui_thread.reset();
-  raster_thread.reset();
-  io_thread.reset();
-  profiler_thread.reset();
-}
-
 }  // namespace flutter
diff --git a/shell/common/thread_host.h b/shell/common/thread_host.h
index fc79a71c534b0..d944963282cb9 100644
--- a/shell/common/thread_host.h
+++ b/shell/common/thread_host.h
@@ -38,8 +38,6 @@ struct ThreadHost {
   ThreadHost(std::string name_prefix, uint64_t type_mask);
 
   ~ThreadHost();
-
-  void ResetThreads();
 };
 
 }  // namespace flutter