Revert of Use ChromeBrowserStateManager instead of BrowserListIOS.

ios/chrome/browser/ui/browser_view_controller.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/ui/browser_view_controller.h"
 
 #import <AssetsLibrary/AssetsLibrary.h>
 #import <MobileCoreServices/MobileCoreServices.h>
 #import <PassKit/PassKit.h>
 #import <Photos/Photos.h>
@@ skipping 70 matching lines @@
 #import "ios/chrome/browser/tabs/tab_model.h"
 #import "ios/chrome/browser/tabs/tab_model_observer.h"
 #import "ios/chrome/browser/tabs/tab_snapshotting_delegate.h"
 #import "ios/chrome/browser/ui/activity_services/share_protocol.h"
 #import "ios/chrome/browser/ui/activity_services/share_to_data.h"
 #import "ios/chrome/browser/ui/alert_coordinator/alert_coordinator.h"
 #import "ios/chrome/browser/ui/authentication/re_signin_infobar_delegate.h"
 #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"
 #import "ios/chrome/browser/ui/commands/generic_chrome_command.h"
 #include "ios/chrome/browser/ui/commands/ios_command_ids.h"
 #import "ios/chrome/browser/ui/commands/open_url_command.h"
 #import "ios/chrome/browser/ui/commands/reading_list_add_command.h"
 #import "ios/chrome/browser/ui/commands/show_mail_composer_command.h"
 #import "ios/chrome/browser/ui/context_menu/context_menu_coordinator.h"
 #import "ios/chrome/browser/ui/contextual_search/contextual_search_controller.h"
@@ skipping 808 matching lines @@
     _nativeControllersForTabIDs.reset(
         [[NSMapTable strongToWeakObjectsMapTable] retain]);
     _dialogPresenter.reset([[DialogPresenter alloc] initWithDelegate:self
                                             presentingViewController:self]);
     _javaScriptDialogPresenter.reset(
         new JavaScriptDialogPresenterImpl(_dialogPresenter));
     _webStateDelegate.reset(new web::WebStateDelegateBridge(self));
     // TODO(leng): Delay this.
     [[UpgradeCenter sharedInstance] registerClient:self];
     _inNewTabAnimation = NO;
+    BrowserListIOS::AddBrowser(self);
     if (model && browserState)
       [self updateWithTabModel:model browserState:browserState];
     if ([[NSUserDefaults standardUserDefaults]
             boolForKey:@"fullScreenShowAlert"]) {
       _fullScreenAlertShown.reset([[NSMutableSet alloc] init]);
     }
   }
   return self;
 }
 
 - (instancetype)initWithNibName:(NSString*)nibNameOrNil
                          bundle:(NSBundle*)nibBundleOrNil {
   NOTREACHED();
   return nil;
 }
 
 - (instancetype)initWithCoder:(NSCoder*)aDecoder {
   NOTREACHED();
   return nil;
 }
 
 - (void)dealloc {
   _tabStripController.reset();
   _infoBarContainer.reset();
   _readingListMenuNotifier.reset();
+  BrowserListIOS::RemoveBrowser(self);
   _bookmarkModel->RemoveObserver(_bookmarkModelBridge.get());
   [_model removeObserver:self];
   [[UpgradeCenter sharedInstance] unregisterClient:self];
   [[NSNotificationCenter defaultCenter] removeObserver:self];
   [_toolbarController setDelegate:nil];
   if (_voiceSearchController.get())
     _voiceSearchController->SetDelegate(nil);
   [_rateThisAppDialog setDelegate:nil];
   [_model closeAllTabs];
   [super dealloc];
@@ skipping 80 matching lines @@
     [self updateDialogPresenterActiveState];
   } else {
     self.dialogPresenter.active = false;
   }
 }
 
 - (BOOL)isPlayingTTS {
   return _voiceSearchController && _voiceSearchController->IsPlayingAudio();
 }
 
-- (ios::ChromeBrowserState*)browserState {
-  return _browserState;
-}
-
-- (TabModel*)tabModel {
-  return _model.get();
-}
-
 - (SideSwipeController*)sideSwipeController {
   if (!_sideSwipeController) {
     _sideSwipeController.reset([[SideSwipeController alloc]
         initWithTabModel:_model
             browserState:_browserState]);
     [_sideSwipeController setSnapshotDelegate:self];
     [_sideSwipeController setSwipeDelegate:self];
   }
   return _sideSwipeController;
 }
@@ skipping 608 matching lines @@
   [self setActive:NO];
   // Reset the toolbar opacity in case it was changed for contextual search.
   [self updateToolbarControlsAlpha:1.0];
   [self updateToolbarBackgroundAlpha:1.0];
   [_contextualSearchController close];
   _contextualSearchController.reset();
   [_contextualSearchPanel removeFromSuperview];
   [_contextualSearchMask removeFromSuperview];
   [_paymentRequestManager close];
   _paymentRequestManager.reset();
+  BrowserListIOS::RemoveBrowser(self);
   [_toolbarController browserStateDestroyed];
   [_model browserStateDestroyed];
   [_preloadController browserStateDestroyed];
   _preloadController.reset();
   // The file remover needs the browser state, so needs to be destroyed now.
   _externalFileRemover.reset();
   _browserState = nullptr;
 }
 
 - (void)installFakeStatusBar {
@@ skipping 1546 matching lines @@
     // the error on the main thread.
     [self displayPrivacyErrorAlertOnMainQueue:errorMessage];
   } else {
     // TODO(noyau): Ideally I'd like to show an infobar with a link to switch to
     // the photo application. The current behaviour is to create the photo there
     // but not providing any link to it is suboptimal. That's what Safari is
     // doing, and what the PM want, but it doesn't make it right.
   }
 }
 
+#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).
 - (void)showNoTabsUI {
   // The No-Tabs UI is only shown on tablet for non-incognito BVCs.  (Incognito
   // mode does not have a No-Tabs UI; the user is simply shown the non-incognito
   // BVC when the last incognito tab is closed.)
   DCHECK(IsIPadIdiom());
   DCHECK(!_isOffTheRecord);
 
@@ skipping 1878 matching lines @@
 
 - (UIView*)voiceSearchButton {
   return _voiceSearchButton;
 }
 
 - (id<LogoAnimationControllerOwner>)logoAnimationControllerOwner {
   return [self currentLogoAnimationControllerOwner];
 }
 
 @end