From 2556f97ba3333c03870a4883887feef275ef7331 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Tue, 7 Apr 2020 13:31:54 -0700
Subject: [PATCH] use weakptr vector in CloseAllWindows

---
 shell/browser/window_list.cc | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/shell/browser/window_list.cc b/shell/browser/window_list.cc
index b9fce95ea0d17..95a5ddeff7bda 100644
--- a/shell/browser/window_list.cc
+++ b/shell/browser/window_list.cc
@@ -14,9 +14,9 @@ namespace {
 template <typename T>
 std::vector<base::WeakPtr<T>> ConvertToWeakPtrVector(std::vector<T*> raw_ptrs) {
   std::vector<base::WeakPtr<T>> converted_to_weak;
+  converted_to_weak.reserve(raw_ptrs.size());
   for (auto* raw_ptr : raw_ptrs) {
-    base::WeakPtr<T> weak = raw_ptr->GetWeakPtr();
-    converted_to_weak.push_back(weak);
+    converted_to_weak.push_back(raw_ptr->GetWeakPtr());
   }
   return converted_to_weak;
 }
@@ -92,11 +92,12 @@ void WindowList::RemoveObserver(WindowListObserver* observer) {
 
 // static
 void WindowList::CloseAllWindows() {
-  WindowVector windows = GetInstance()->windows_;
+  std::vector<base::WeakPtr<NativeWindow>> weak_windows =
+      ConvertToWeakPtrVector(GetInstance()->windows_);
 #if defined(OS_MACOSX)
-  std::reverse(windows.begin(), windows.end());
+  std::reverse(weak_windows.begin(), weak_windows.end());
 #endif
-  for (auto* const& window : windows) {
+  for (const auto& window : weak_windows) {
     if (window && !window->IsClosed())
       window->Close();
   }
@@ -104,9 +105,8 @@ void WindowList::CloseAllWindows() {
 
 // static
 void WindowList::DestroyAllWindows() {
-  WindowVector windows = GetInstance()->windows_;
   std::vector<base::WeakPtr<NativeWindow>> weak_windows =
-      ConvertToWeakPtrVector(windows);
+      ConvertToWeakPtrVector(GetInstance()->windows_);
 
   for (const auto& window : weak_windows) {
     if (window)