| Index: ios/chrome/browser/ui/browser_view_controller_unittest.mm
|
| diff --git a/ios/chrome/browser/ui/browser_view_controller_unittest.mm b/ios/chrome/browser/ui/browser_view_controller_unittest.mm
|
| index ca22cbc75a4208e1ff714661d80c3597ba6de8e2..cbe5c55e7627a93c49903347a2c4bfdf7ba4bb7b 100644
|
| --- a/ios/chrome/browser/ui/browser_view_controller_unittest.mm
|
| +++ b/ios/chrome/browser/ui/browser_view_controller_unittest.mm
|
| @@ -156,10 +156,6 @@ class BrowserViewControllerTest : public BlockCleanupTest {
|
| [[[tabModel stub] andReturnValue:OCMOCK_VALUE(enabled)] webUsageEnabled];
|
| [[[tabModel stub] andReturn:currentTab] currentTab];
|
| [[[tabModel stub] andReturn:currentTab] tabAtIndex:0];
|
| - GURL URL("http://www.google.com");
|
| - [[[tabModel stub] andReturn:currentTab] addTabWithURL:URL
|
| - referrer:web::Referrer()
|
| - windowName:[OCMArg any]];
|
| [[tabModel stub] addObserver:[OCMArg any]];
|
| [[tabModel stub] removeObserver:[OCMArg any]];
|
| [[tabModel stub] saveSessionImmediately:NO];
|
| @@ -199,8 +195,8 @@ class BrowserViewControllerTest : public BlockCleanupTest {
|
| newTabStripControllerWithTabModel:[OCMArg any]];
|
| [[[factory stub] andReturn:nil] newPreloadController];
|
| [[[factory stub] andReturnValue:OCMOCK_VALUE(toolbarModelIOS_)]
|
| - newToolbarModelIOSWithDelegate:(ToolbarModelDelegateIOS*)
|
| - [OCMArg anyPointer]];
|
| + newToolbarModelIOSWithDelegate:static_cast<ToolbarModelDelegateIOS*>(
|
| + [OCMArg anyPointer])];
|
| [[[factory stub] andReturn:nil]
|
| newWebToolbarControllerWithDelegate:[OCMArg any]
|
| urlLoader:[OCMArg any]
|
| @@ -306,7 +302,7 @@ TEST_F(BrowserViewControllerTest, TestTabSelectedIsNewTab) {
|
| }
|
|
|
| TEST_F(BrowserViewControllerTest, TestTabDeselected) {
|
| - OCMockObject* tabMock = (OCMockObject*)tab_.get();
|
| + OCMockObject* tabMock = static_cast<OCMockObject*>(tab_.get());
|
| [[tabMock expect] wasHidden];
|
| NSDictionary* userInfoWithThisTab =
|
| [NSDictionary dictionaryWithObject:tab_ forKey:kTabModelTabKey];
|
| @@ -366,10 +362,10 @@ TEST_F(BrowserViewControllerTest, DISABLED_TestShieldWasTapped) {
|
| // load on a handset, but not stop the load on a tablet.
|
| TEST_F(BrowserViewControllerTest,
|
| TestLocationBarBeganEdit_whenPageLoadIsInProgress) {
|
| - OCMockObject* tabMock = (OCMockObject*)tab_.get();
|
| + OCMockObject* tabMock = static_cast<OCMockObject*>(tab_.get());
|
|
|
| // Have the TestToolbarModel indicate that a page load is in progress.
|
| - ((TestToolbarModelIOS*)toolbarModelIOS_)->set_is_loading(true);
|
| + static_cast<TestToolbarModelIOS*>(toolbarModelIOS_)->set_is_loading(true);
|
|
|
| // The tab should only stop loading on handsets.
|
| if (!IsIPadIdiom())
|
| @@ -383,10 +379,10 @@ TEST_F(BrowserViewControllerTest,
|
| // to stop the load on a handset or a tablet.
|
| TEST_F(BrowserViewControllerTest,
|
| TestLocationBarBeganEdit_whenPageLoadIsComplete) {
|
| - OCMockObject* tabMock = (OCMockObject*)tab_.get();
|
| + OCMockObject* tabMock = static_cast<OCMockObject*>(tab_.get());
|
|
|
| // Have the TestToolbarModel indicate that the page load is complete.
|
| - ((TestToolbarModelIOS*)toolbarModelIOS_)->set_is_loading(false);
|
| + static_cast<TestToolbarModelIOS*>(toolbarModelIOS_)->set_is_loading(false);
|
|
|
| // Don't set any expectation for stopLoading to be called on the mock tab.
|
| [bvc_ locationBarBeganEdit:nil];
|
| @@ -399,8 +395,8 @@ TEST_F(BrowserViewControllerTest,
|
| TEST_F(BrowserViewControllerTest, TestSharePageCommandHandling) {
|
| GURL expectedUrl("http://www.testurl.net");
|
| NSString* expectedTitle = @"title";
|
| - [(BVCTestTabMock*)tab_.get() setUrl:expectedUrl];
|
| - OCMockObject* tabMock = (OCMockObject*)tab_.get();
|
| + [static_cast<BVCTestTabMock*>(tab_.get()) setUrl:expectedUrl];
|
| + OCMockObject* tabMock = static_cast<OCMockObject*>(tab_.get());
|
| ios::ChromeBrowserState* ptr = chrome_browser_state_.get();
|
| [[[tabMock stub] andReturnValue:OCMOCK_VALUE(ptr)] browserState];
|
| [[[tabMock stub] andReturn:expectedTitle] title];
|
| @@ -410,14 +406,15 @@ TEST_F(BrowserViewControllerTest, TestSharePageCommandHandling) {
|
| CGSizeMake(300, 400), [UIColor blueColor]);
|
| [[[tabMock stub] andReturn:tabSnapshot] generateSnapshotWithOverlay:NO
|
| visibleFrameOnly:YES];
|
| - OCMockObject* shareControllerMock = (OCMockObject*)shareController_.get();
|
| + OCMockObject* shareControllerMock =
|
| + static_cast<OCMockObject*>(shareController_.get());
|
| // Passing non zero/nil |fromRect| and |inView| parameters to satisfy protocol
|
| // requirements.
|
| BOOL (^shareDataChecker)
|
| (id value) = ^BOOL(id value) {
|
| if (![value isMemberOfClass:ShareToData.class])
|
| return NO;
|
| - ShareToData* shareToData = (ShareToData*)value;
|
| + ShareToData* shareToData = static_cast<ShareToData*>(value);
|
| CGSize size = CGSizeMake(40, 40);
|
| BOOL thumbnailDataIsEqual = ui::test::uiimage_utils::UIImagesAreEqual(
|
| shareToData.thumbnailGenerator(size),
|
| @@ -446,13 +443,14 @@ TEST_F(BrowserViewControllerTest, TestSharePageWhenClosing) {
|
| GURL expectedUrl("http://www.testurl.net");
|
| NSString* expectedTitle = @"title";
|
| // Sets WebState to nil because [tab close] clears the WebState.
|
| - [(BVCTestTabMock*)tab_.get() setWebState:nil];
|
| - [(BVCTestTabMock*)tab_.get() setUrl:expectedUrl];
|
| - OCMockObject* tabMock = (OCMockObject*)tab_.get();
|
| + [static_cast<BVCTestTabMock*>(tab_.get()) setWebState:nil];
|
| + [static_cast<BVCTestTabMock*>(tab_.get()) setUrl:expectedUrl];
|
| + OCMockObject* tabMock = static_cast<OCMockObject*>(tab_.get());
|
| [[[tabMock stub] andReturn:expectedTitle] title];
|
| [[[tabMock stub] andReturn:expectedTitle] originalTitle];
|
| // Explicitly disallow the execution of the ShareController.
|
| - OCMockObject* shareControllerMock = (OCMockObject*)shareController_.get();
|
| + OCMockObject* shareControllerMock =
|
| + static_cast<OCMockObject*>(shareController_.get());
|
| [[shareControllerMock reject]
|
| shareWithData:[OCMArg any]
|
| controller:bvc_
|
| @@ -489,7 +487,7 @@ TEST_F(BrowserViewControllerTest, TestShareDidCompleteWithError) {
|
| alertCoordinatorWithTitle:errorTitle
|
| message:errorMessage
|
| viewController:OCMOCK_ANY];
|
| - [((AlertCoordinator*)[mockCoordinator expect])start];
|
| + [static_cast<AlertCoordinator*>([mockCoordinator expect]) start];
|
|
|
| [bvc_ shareDidComplete:ShareTo::SHARE_ERROR successMessage:@"dummy"];
|
| EXPECT_OCMOCK_VERIFY(dependencyFactory_);
|
| @@ -535,7 +533,8 @@ TEST_F(BrowserViewControllerTest, TestPassKitErrorInfoBarDisplayed) {
|
| }
|
|
|
| TEST_F(BrowserViewControllerTest, TestClearPresentedState) {
|
| - OCMockObject* shareControllerMock = (OCMockObject*)shareController_.get();
|
| + OCMockObject* shareControllerMock =
|
| + static_cast<OCMockObject*>(shareController_.get());
|
| [[shareControllerMock expect] cancelShareAnimated:NO];
|
| EXPECT_CALL(*this, OnCompletionCalled());
|
| [bvc_ clearPresentedStateWithCompletion:^{
|
|
|