[ios] Switches ToolbarModelDelegateIOS to use WebStateList.

ios/chrome/browser/ui/browser_view_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 <Foundation/Foundation.h>
 #import <PassKit/PassKit.h>
 
 #include <memory>
 
 #include "base/command_line.h"
@@ skipping 30 matching lines @@
 #import "ios/chrome/browser/ui/page_not_available_controller.h"
 #include "ios/chrome/browser/ui/toolbar/test_toolbar_model_ios.h"
 #import "ios/chrome/browser/ui/toolbar/web_toolbar_controller.h"
 #include "ios/chrome/browser/ui/ui_util.h"
 #import "ios/chrome/browser/web/error_page_content.h"
 #import "ios/chrome/browser/web/passkit_dialog_provider.h"
 #include "ios/chrome/grit/ios_strings.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/shared/chrome/browser/tabs/fake_web_state_list_delegate.h"
+#include "ios/shared/chrome/browser/tabs/web_state_list.h"
 #import "ios/testing/ocmock_complex_type_helper.h"
 #include "ios/web/public/referrer.h"
 #include "ios/web/public/test/test_web_thread_bundle.h"
 #import "ios/web/public/web_state/ui/crw_native_content_provider.h"
 #import "ios/web/web_state/ui/crw_web_controller.h"
 #import "ios/web/web_state/web_state_impl.h"
 #import "net/base/mac/url_conversions.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 45 matching lines @@
   webState_ = webState;
 }
 - (web::NavigationManager*)navigationManager {
   return &(webState_->GetNavigationManagerImpl());
 }
 - (web::NavigationManagerImpl*)navigationManagerImpl {
   return &(webState_->GetNavigationManagerImpl());
 }
 @end
 
+@interface BVCTestTabModel : OCMockComplexTypeHelper

[rohitrao (ping after 24h), 2017/03/24 14:13:48]

This is "broken" because the ToolbarModel's WebStateList is not kept in sync
with the actual mock TabModel, but the ToolbarModel isn't used for anything in
this test, so everything passes just fine.

We should revisit and rewrite this test once TabModel is simply a shim on top of
WebStateList.  At that point, we can probably get rid of mock TabModels across
the whole codebase.

+- (instancetype)init NS_DESIGNATED_INITIALIZER;
+@end
+
+@implementation BVCTestTabModel {
+  FakeWebStateListDelegate _webStateListDelegate;
+  std::unique_ptr<WebStateList> _webStateList;
+}
+
+- (instancetype)init {
+  if ((self = [super
+           initWithRepresentedObject:[OCMockObject
+                                         niceMockForClass:[TabModel class]]])) {
+    _webStateList = base::MakeUnique<WebStateList>(&_webStateListDelegate,
+                                                   WebStateList::WebStateOwned);
+  }
+  return self;
+}
+
+- (WebStateList*)webStateList {
+  return _webStateList.get();
+}
+@end
+
 #pragma mark -
 
 namespace {
 class BrowserViewControllerTest : public BlockCleanupTest {
  public:
   BrowserViewControllerTest() {}
 
  protected:
   void SetUp() override {
     BlockCleanupTest::SetUp();
@@ skipping 13 matching lines @@
         ios::TemplateURLServiceFactory::GetInstance(),
         ios::TemplateURLServiceFactory::GetDefaultFactory());
     chrome_browser_state_ = test_cbs_builder.Build();
     chrome_browser_state_->CreateBookmarkModel(false);
     bookmarks::BookmarkModel* bookmark_model =
         ios::BookmarkModelFactory::GetForBrowserState(
             chrome_browser_state_.get());
     bookmarks::test::WaitForBookmarkModelToLoad(bookmark_model);
 
     // Set up mock TabModel, Tab, and CRWWebController.
-    id tabModel = [OCMockObject mockForClass:[TabModel class]];
+    base::scoped_nsobject<id> tabModel([[BVCTestTabModel alloc] init]);
     base::scoped_nsobject<id> currentTab([[BVCTestTabMock alloc]
         initWithRepresentedObject:[OCMockObject niceMockForClass:[Tab class]]]);
     id webControllerMock =
         [OCMockObject niceMockForClass:[CRWWebController class]];
 
     // Stub methods for TabModel.
     NSUInteger tabCount = 1;
     [[[tabModel stub] andReturnValue:OCMOCK_VALUE(tabCount)] count];
     BOOL enabled = YES;
     [[[tabModel stub] andReturnValue:OCMOCK_VALUE(enabled)] webUsageEnabled];
@@ skipping 379 matching lines @@
       static_cast<OCMockObject*>(shareController_.get());
   [[shareControllerMock expect] cancelShareAnimated:NO];
   EXPECT_CALL(*this, OnCompletionCalled());
   [bvc_ clearPresentedStateWithCompletion:^{
     this->OnCompletionCalled();
   }];
   EXPECT_OCMOCK_VERIFY(shareControllerMock);
 }
 
 }  // namespace