[ios] Remove TabModel cleanup from -dealloc to -browserStateDestroyed.

ios/chrome/browser/tabs/tab_model.mm

 // Copyright 2012 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/chrome/browser/tabs/tab_model.h"
 
 #include <cstdint>
 #include <utility>
 #include <vector>
 
@@ skipping 173 matching lines @@
 
 @implementation TabModel
 
 @synthesize browserState = _browserState;
 @synthesize sessionID = _sessionID;
 @synthesize webUsageEnabled = webUsageEnabled_;
 
 #pragma mark - Overriden
 
 - (void)dealloc {
-  // Make sure the tabs do clean after themselves. It is important for
-  // removeObserver: to be called first otherwise a lot of unecessary work will

[rohitrao (ping after 24h), 2017/05/16 13:28:10]

We are changing the semantics here.  It seems likely that observers will still
exist when we call closeAllTabs.  Is that ok?  Is there any way to restore the
existing behavior?

-  // happen on -closeAllTabs.
-  DCHECK([_observers empty]);
-
   // browserStateDestroyed should always have been called before destruction.
   DCHECK(!_browserState);
 
-  [[NSNotificationCenter defaultCenter] removeObserver:self];
-
-  // Clear weak pointer to WebStateListMetricsObserver before destroying it.
-  _webStateListMetricsObserver = nullptr;
-
-  // Close all tabs. Do this in an @autoreleasepool as WebStateList observers
-  // will be notified (they are unregistered later). As some of them may be
-  // implemented in Objective-C and unregister themselves in their -dealloc
-  // method, ensure they -autorelease introduced by ARC are processed before
-  // the WebStateList destructor is called.
-  @autoreleasepool {
-    [self closeAllTabs];
-  }
-
-  // Unregister all observers after closing all the tabs as some of them are
-  // required to properly clean up the Tabs.
-  for (const auto& webStateListObserver : _webStateListObservers)
-    _webStateList->RemoveObserver(webStateListObserver.get());
-  _webStateListObservers.clear();
-  _retainedWebStateListObservers = nil;
-
-  _clearPoliciesTaskTracker.TryCancelAll();
+  // Make sure the observers do clean after themselves.
+  DCHECK([_observers empty]);
 }
 
 #pragma mark - Public methods
 
 - (Tab*)currentTab {
   web::WebState* webState = _webStateList->GetActiveWebState();
   return webState ? LegacyTabHelper::GetTabForWebState(webState) : nil;
 }
 
 - (void)setCurrentTab:(Tab*)newTab {
@@ skipping 390 matching lines @@
     if (UrlIsExternalFileReference(URL)) {
       NSString* fileName = base::SysUTF8ToNSString(URL.ExtractFileName());
       [referencedFiles addObject:fileName];
     }
   }
   return referencedFiles;
 }
 
 // NOTE: This can be called multiple times, so must be robust against that.
 - (void)browserStateDestroyed {
+  if (!_browserState)
+    return;
+
   [[NSNotificationCenter defaultCenter] removeObserver:self];
-  if (_browserState) {
-    UnregisterTabModelFromChromeBrowserState(_browserState, self);
+  UnregisterTabModelFromChromeBrowserState(_browserState, self);
+  _browserState = nullptr;
+
+  // Clear weak pointer to WebStateListMetricsObserver before destroying it.
+  _webStateListMetricsObserver = nullptr;
+
+  // Close all tabs. Do this in an @autoreleasepool as WebStateList observers
+  // will be notified (they are unregistered later). As some of them may be
+  // implemented in Objective-C and unregister themselves in their -dealloc
+  // method, ensure they -autorelease introduced by ARC are processed before
+  // the WebStateList destructor is called.
+  @autoreleasepool {
+    [self closeAllTabs];
   }
-  _browserState = nullptr;
+
+  // Unregister all observers after closing all the tabs as some of them are
+  // required to properly clean up the Tabs.
+  for (const auto& webStateListObserver : _webStateListObservers)
+    _webStateList->RemoveObserver(webStateListObserver.get());
+  _webStateListObservers.clear();
+  _retainedWebStateListObservers = nil;
+
+  _clearPoliciesTaskTracker.TryCancelAll();
 }
 
 - (void)navigationCommittedInTab:(Tab*)tab
                     previousItem:(web::NavigationItem*)previousItem {
   if (self.offTheRecord)
     return;
   if (![tab navigationManager])
     return;
 
   // See if the navigation was within a page; if so ignore it.
@@ skipping 139 matching lines @@
 }
 
 // Called when UIApplicationWillEnterForegroundNotification is received.
 - (void)applicationWillEnterForeground:(NSNotification*)notify {
   if (_tabUsageRecorder) {
     _tabUsageRecorder->AppWillEnterForeground();
   }
 }
 
 @end