Fix WebStateListObserver::WebStateDetachedAt() parameter lifetime.

ios/shared/chrome/browser/tabs/web_state_list.mm

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "ios/shared/chrome/browser/tabs/web_state_list.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #import "ios/shared/chrome/browser/tabs/web_state_list_observer.h"
 #import "ios/shared/chrome/browser/tabs/web_state_list_order_controller.h"
 #import "ios/web/public/navigation_manager.h"
 #import "ios/web/public/web_state/web_state.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
-// Wrapper around a WebState stored in a WebStateList. May own the WebState
-// dependending on the WebStateList ownership setting (should always be true
-// once ownership of Tab is sane, see http://crbug.com/546222 for progress).
+// Wrapper around a WebState stored in a WebStateList.
 class WebStateList::WebStateWrapper {
  public:
-  WebStateWrapper(web::WebState* web_state, bool assume_ownership);
+  explicit WebStateWrapper(web::WebState* web_state);
   ~WebStateWrapper();
 
   web::WebState* web_state() const { return web_state_; }
   web::WebState* opener() const { return opener_; }
 
   // Replaces the wrapped WebState (and clear associated state) and returns the
   // old WebState after forfeiting ownership.
   web::WebState* ReplaceWebState(web::WebState* web_state);
 
   // Sets the opener for the wrapped WebState and record the opener navigation
   // index to allow detecting navigation changes during the same session.
   void SetOpener(web::WebState* opener);
 
   // Returns whether |opener| spawned the wrapped WebState. If |use_group| is
   // true, also use the opener navigation index to detect navigation changes
   // during the same session.
   bool WasOpenedBy(const web::WebState* opener,
                    int opener_navigation_index,
                    bool use_group) const;
 
  private:
   web::WebState* web_state_;
   web::WebState* opener_ = nullptr;
   int opener_last_committed_index_;
-  const bool has_web_state_ownership_;
 
   DISALLOW_COPY_AND_ASSIGN(WebStateWrapper);
 };
 
-WebStateList::WebStateWrapper::WebStateWrapper(web::WebState* web_state,
-                                               bool assume_ownership)
-    : web_state_(web_state), has_web_state_ownership_(assume_ownership) {
+WebStateList::WebStateWrapper::WebStateWrapper(web::WebState* web_state)
+    : web_state_(web_state) {
   DCHECK(web_state_);
 }
 
-WebStateList::WebStateWrapper::~WebStateWrapper() {
-  if (has_web_state_ownership_)
-    delete web_state_;
-}
+WebStateList::WebStateWrapper::~WebStateWrapper() = default;
 
 web::WebState* WebStateList::WebStateWrapper::ReplaceWebState(
     web::WebState* web_state) {
   DCHECK(web_state);
   DCHECK_NE(web_state, web_state_);
   std::swap(web_state, web_state_);
   opener_ = nullptr;
   return web_state;
 }
 
@@ skipping 15 matching lines @@
   if (!use_group)
     return true;
 
   return opener_last_committed_index_ == opener_navigation_index;
 }
 
 WebStateList::WebStateList(WebStateOwnership ownership)
     : web_state_ownership_(ownership),
       order_controller_(base::MakeUnique<WebStateListOrderController>(this)) {}
 
-WebStateList::~WebStateList() = default;
+WebStateList::~WebStateList() {
+  // Once WebStateList owns the WebState and has a CloseWebStateAt() method,
+  // then change this to close all the WebState. See http://crbug.com/546222
+  // for progress.
+  if (web_state_ownership_ == WebStateOwned) {
+    for (auto& web_state_wrapper : web_state_wrappers_) {
+      web::WebState* web_state = web_state_wrapper->web_state();
+      delete web_state;
+    }
+  }
+}
 
 bool WebStateList::ContainsIndex(int index) const {
   return 0 <= index && index < count();
 }
 
 web::WebState* WebStateList::GetWebStateAt(int index) const {
   DCHECK(ContainsIndex(index));
   return web_state_wrappers_[index]->web_state();
 }
 
@@ skipping 25 matching lines @@
 int WebStateList::GetIndexOfLastWebStateOpenedBy(const web::WebState* opener,
                                                  int start_index,
                                                  bool use_group) const {
   return GetIndexOfNthWebStateOpenedBy(opener, start_index, use_group, INT_MAX);
 }
 
 void WebStateList::InsertWebState(int index,
                                   web::WebState* web_state,
                                   web::WebState* opener) {
   DCHECK(ContainsIndex(index) || index == count());
-  web_state_wrappers_.insert(
-      web_state_wrappers_.begin() + index,
-      base::MakeUnique<WebStateWrapper>(web_state,
-                                        web_state_ownership_ == WebStateOwned));
+  web_state_wrappers_.insert(web_state_wrappers_.begin() + index,
+                             base::MakeUnique<WebStateWrapper>(web_state));
 
   if (opener)
     SetOpenerOfWebStateAt(index, opener);
 
   for (auto& observer : observers_)
     observer.WebStateInsertedAt(this, web_state, index);
 }
 
 void WebStateList::AppendWebState(ui::PageTransition transition,
                                   web::WebState* web_state,
@@ skipping 33 matching lines @@
 
   if (opener && opener != old_web_state)
     SetOpenerOfWebStateAt(index, opener);
 
   for (auto& observer : observers_)
     observer.WebStateReplacedAt(this, old_web_state, web_state, index);
 
   return old_web_state;
 }
 
-void WebStateList::DetachWebStateAt(int index) {
+web::WebState* WebStateList::DetachWebStateAt(int index) {
   DCHECK(ContainsIndex(index));
   ClearOpenersReferencing(index);
 
-  web::WebState* web_state = web_state_wrappers_[index]->web_state();
+  web::WebState* old_web_state = web_state_wrappers_[index]->web_state();
   web_state_wrappers_.erase(web_state_wrappers_.begin() + index);
 
   for (auto& observer : observers_)
-    observer.WebStateDetachedAt(this, web_state, index);
+    observer.WebStateDetachedAt(this, old_web_state, index);
+
+  return old_web_state;
 }
 
 void WebStateList::AddObserver(WebStateListObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void WebStateList::RemoveObserver(WebStateListObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
@@ skipping 25 matching lines @@
     } else if (found_index != kInvalidIndex) {
       return found_index;
     }
   }
 
   return found_index;
 }
 
 // static
 const int WebStateList::kInvalidIndex;