Revert of Replace TabModel with WebStateList in GoogleLandingController.

ios/chrome/browser/ui/ntp/new_tab_page_controller_unittest.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/ntp/new_tab_page_controller.h"
 
 #include <memory>
 
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "components/bookmarks/test/bookmark_test_helpers.h"
 #include "components/prefs/testing_pref_service.h"
 #include "components/search_engines/template_url_service.h"
 #include "components/sessions/core/tab_restore_service.h"
 #include "ios/chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "ios/chrome/browser/browser_state/test_chrome_browser_state.h"
 #include "ios/chrome/browser/chrome_url_constants.h"
 #include "ios/chrome/browser/search_engines/template_url_service_factory.h"
 #include "ios/chrome/browser/sessions/ios_chrome_tab_restore_service_factory.h"
-#import "ios/chrome/browser/sessions/test_session_service.h"
-#import "ios/chrome/browser/tabs/tab_model.h"
 #import "ios/chrome/browser/ui/ntp/new_tab_page_view.h"
 #include "ios/chrome/browser/ui/ui_util.h"
 #include "ios/chrome/test/block_cleanup_test.h"
 #include "ios/chrome/test/ios_chrome_scoped_testing_local_state.h"
 #include "ios/chrome/test/testing_application_context.h"
 #include "ios/web/public/test/test_web_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/gtest_mac.h"
 #import "third_party/ocmock/OCMock/OCMock.h"
 #import "third_party/ocmock/gtest_support.h"
@@ skipping 50 matching lines @@
         ios::TemplateURLServiceFactory::GetForBrowserState(
             chrome_browser_state_.get());
     template_url_service->Load();
 
     chrome_browser_state_->CreateBookmarkModel(true);
     bookmarks::test::WaitForBookmarkModelToLoad(
         ios::BookmarkModelFactory::GetForBrowserState(
             chrome_browser_state_.get()));
     GURL url(kChromeUINewTabURL);
     parentViewController_ = [[UIViewController alloc] init];
-    tabModel_ = [[TabModel alloc]
-        initWithSessionWindow:nil
-               sessionService:[[TestSessionService alloc] init]
-                 browserState:chrome_browser_state_.get()];
     controller_ =
         [[NewTabPageController alloc] initWithUrl:url
                                            loader:nil
                                           focuser:nil
                                       ntpObserver:nil
                                      browserState:chrome_browser_state_.get()
                                        colorCache:nil
                                webToolbarDelegate:nil
-                                         tabModel:tabModel_
+                                         tabModel:nil
                              parentViewController:parentViewController_];
 
     incognitoController_ = [[NewTabPageController alloc]
                  initWithUrl:url
                       loader:nil
                      focuser:nil
                  ntpObserver:nil
                 browserState:chrome_browser_state_
                                  ->GetOffTheRecordChromeBrowserState()
                   colorCache:nil
           webToolbarDelegate:nil
                     tabModel:nil
         parentViewController:parentViewController_];
   };
 
   void TearDown() override {
     incognitoController_ = nil;
     controller_ = nil;
     parentViewController_ = nil;
-    [tabModel_ browserStateDestroyed];
-    tabModel_ = nil;
 
     // There may be blocks released below that have weak references to |profile|
     // owned by chrome_browser_state_.  Ensure BlockCleanupTest::TearDown() is
     // called before |chrome_browser_state_| is reset.
     BlockCleanupTest::TearDown();
     chrome_browser_state_.reset();
   }
 
   web::TestWebThreadBundle thread_bundle_;
   IOSChromeScopedTestingLocalState local_state_;
   std::unique_ptr<TestChromeBrowserState> chrome_browser_state_;
-  TabModel* tabModel_;
   UIViewController* parentViewController_;
   NewTabPageController* controller_;
   NewTabPageController* incognitoController_;
 };
 
 TEST_F(NewTabPageControllerTest, NewTabBarItemDidChange) {
   // Switching the selected index in the NewTabPageBar should cause
   // newTabBarItemDidChange to get called.
   NewTabPageBar* bar = [[controller_ ntpView] tabBar];
   NSUInteger bookmarkIndex = 0;
@@ skipping 74 matching lines @@
   EXPECT_EQ("open_tabs",
             NewTabPage::FragmentFromIdentifier(NewTabPage::kOpenTabsPanel));
   EXPECT_EQ("", NewTabPage::FragmentFromIdentifier(NewTabPage::kNone));
   EXPECT_EQ(NewTabPage::kBookmarksPanel,
             NewTabPage::IdentifierFromFragment("bookmarks"));
   EXPECT_EQ(NewTabPage::kNone, NewTabPage::IdentifierFromFragment("garbage"));
   EXPECT_EQ(NewTabPage::kNone, NewTabPage::IdentifierFromFragment(""));
 }
 
 }  // anonymous namespace