Revert of Use ChromeBrowserStateManager instead of BrowserListIOS.

ios/chrome/browser/ui/browser_view_controller.mm

Index: ios/chrome/browser/ui/browser_view_controller.mm
diff --git a/ios/chrome/browser/ui/browser_view_controller.mm b/ios/chrome/browser/ui/browser_view_controller.mm
index 1c3a6621ece7bb5882c8ed822d79ffea5d349f09..113c3f260c4522d7a3eb9e881a56fb0c0dfc688e 100644
--- a/ios/chrome/browser/ui/browser_view_controller.mm
+++ b/ios/chrome/browser/ui/browser_view_controller.mm
@@ -88,6 +88,7 @@
 #import "ios/chrome/browser/ui/background_generator.h"
 #import "ios/chrome/browser/ui/bookmarks/bookmark_interaction_controller.h"
 #import "ios/chrome/browser/ui/browser_container_view.h"
+#import "ios/chrome/browser/ui/browser_list_ios.h"
 #import "ios/chrome/browser/ui/browser_view_controller_dependency_factory.h"
 #import "ios/chrome/browser/ui/chrome_web_view_factory.h"
 #import "ios/chrome/browser/ui/commands/UIKit+ChromeExecuteCommand.h"
@@ -916,6 +917,7 @@
     // TODO(leng): Delay this.
     [[UpgradeCenter sharedInstance] registerClient:self];
     _inNewTabAnimation = NO;
+    BrowserListIOS::AddBrowser(self);
     if (model && browserState)
       [self updateWithTabModel:model browserState:browserState];
     if ([[NSUserDefaults standardUserDefaults]
@@ -941,6 +943,7 @@
   _tabStripController.reset();
   _infoBarContainer.reset();
   _readingListMenuNotifier.reset();
+  BrowserListIOS::RemoveBrowser(self);
   _bookmarkModel->RemoveObserver(_bookmarkModelBridge.get());
   [_model removeObserver:self];
   [[UpgradeCenter sharedInstance] unregisterClient:self];
@@ -1039,14 +1042,6 @@
 
 - (BOOL)isPlayingTTS {
   return _voiceSearchController && _voiceSearchController->IsPlayingAudio();
-}
-
-- (ios::ChromeBrowserState*)browserState {
-  return _browserState;
-}
-
-- (TabModel*)tabModel {
-  return _model.get();
 }
 
 - (SideSwipeController*)sideSwipeController {
@@ -1677,6 +1672,7 @@
   [_contextualSearchMask removeFromSuperview];
   [_paymentRequestManager close];
   _paymentRequestManager.reset();
+  BrowserListIOS::RemoveBrowser(self);
   [_toolbarController browserStateDestroyed];
   [_model browserStateDestroyed];
   [_preloadController browserStateDestroyed];
@@ -3243,6 +3239,16 @@
   }
 }
 
+#pragma mark - BrowserIOS methods
+
+- (ios::ChromeBrowserState*)browserState {
+  return _browserState;
+}
+
+- (TabModel*)tabModel {
+  return _model.get();
+}
+
 #pragma mark - No-tabs UI methods
 
 // Show the No-Tabs UI (hiding normal tab/web ui).