Remove usage of Tab's |url| property from BrowserViewController.

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 64 matching lines @@
     Testing)<CRWNativeContentProvider, PassKitDialogProvider, ShareToDelegate>
 - (void)pageLoadStarted:(NSNotification*)notification;
 - (void)pageLoadComplete:(NSNotification*)notification;
 - (void)tabSelected:(Tab*)tab;
 - (void)tabDeselected:(NSNotification*)notification;
 - (void)tabCountChanged:(NSNotification*)notification;
 - (IBAction)chromeExecuteCommand:(id)sender;
 @end
 
 @interface BVCTestTabMock : OCMockComplexTypeHelper {
-  GURL url_;
-  WebStateImpl* webState_;
+  GURL _url;
+  GURL _lastCommittedURL;
+  GURL _visibleURL;
+  WebStateImpl* _webState;
 }
 
 @property(nonatomic, assign) const GURL& url;
+@property(nonatomic, assign) const GURL& lastCommittedURL;
+@property(nonatomic, assign) const GURL& visibleURL;
 @property(nonatomic, assign) WebStateImpl* webState;
 
 - (web::NavigationManager*)navigationManager;
 - (web::NavigationManagerImpl*)navigationManagerImpl;
 
 @end
 
 @implementation BVCTestTabMock
 - (const GURL&)url {
-  return url_;
+  return _url;
 }
 - (void)setUrl:(const GURL&)url {
-  url_ = url;
+  _url = url;
+}
+- (const GURL&)lastCommittedURL {
+  return _lastCommittedURL;
+}
+- (void)setLastCommittedURL:(const GURL&)lastCommittedURL {
+  _lastCommittedURL = lastCommittedURL;
+}
+- (const GURL&)visibleURL {
+  return _visibleURL;
+}
+- (void)setVisibleURL:(const GURL&)visibleURL {
+  _visibleURL = visibleURL;
 }
 - (WebStateImpl*)webState {
-  return webState_;
+  return _webState;
 }
 - (void)setWebState:(WebStateImpl*)webState {
-  webState_ = webState;
+  _webState = webState;
 }
 - (web::NavigationManager*)navigationManager {
-  return &(webState_->GetNavigationManagerImpl());
+  return &(_webState->GetNavigationManagerImpl());
 }
 - (web::NavigationManagerImpl*)navigationManagerImpl {
-  return &(webState_->GetNavigationManagerImpl());
+  return &(_webState->GetNavigationManagerImpl());
 }
 @end
 
 @interface BVCTestTabModel : OCMockComplexTypeHelper
 - (instancetype)init NS_DESIGNATED_INITIALIZER;
 @end
 
 @implementation BVCTestTabModel {
   FakeWebStateListDelegate _webStateListDelegate;
   std::unique_ptr<WebStateList> _webStateList;
@@ skipping 290 matching lines @@
   [bvc_ locationBarBeganEdit:nil];
 
   EXPECT_OCMOCK_VERIFY(tabMock);
 }
 
 // Verifies that BVC invokes -shareURL on ShareController with the correct
 // parameters in response to the IDC_SHARE_PAGE command.
 TEST_F(BrowserViewControllerTest, TestSharePageCommandHandling) {
   GURL expectedUrl("http://www.testurl.net");
   NSString* expectedTitle = @"title";
-  [static_cast<BVCTestTabMock*>(tab_.get()) setUrl:expectedUrl];
+  static_cast<BVCTestTabMock*>(tab_.get()).url = expectedUrl;
+  static_cast<BVCTestTabMock*>(tab_.get()).lastCommittedURL = expectedUrl;
+  static_cast<BVCTestTabMock*>(tab_.get()).visibleURL = 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];
   [[[tabMock stub] andReturn:expectedTitle] originalTitle];
 
   UIImage* tabSnapshot = ui::test::uiimage_utils::UIImageWithSizeAndSolidColor(
       CGSizeMake(300, 400), [UIColor blueColor]);
   [[[tabMock stub] andReturn:tabSnapshot] generateSnapshotWithOverlay:NO
                                                      visibleFrameOnly:YES];
@@ skipping 27 matching lines @@
   [bvc_ chromeExecuteCommand:GetCommandWithTag(IDC_SHARE_PAGE)];
   EXPECT_OCMOCK_VERIFY(shareControllerMock);
 }
 
 // Verifies that BVC does not invoke -shareURL on ShareController in response
 // to the IDC_SHARE_PAGE command if tab is in the process of being closed.
 TEST_F(BrowserViewControllerTest, TestSharePageWhenClosing) {
   GURL expectedUrl("http://www.testurl.net");
   NSString* expectedTitle = @"title";
   // Sets WebState to nil because [tab close] clears the WebState.
-  [static_cast<BVCTestTabMock*>(tab_.get()) setWebState:nil];
-  [static_cast<BVCTestTabMock*>(tab_.get()) setUrl:expectedUrl];
+  static_cast<BVCTestTabMock*>(tab_.get()).webState = nil;
+  static_cast<BVCTestTabMock*>(tab_.get()).url = expectedUrl;
+  static_cast<BVCTestTabMock*>(tab_.get()).lastCommittedURL = expectedUrl;
+  static_cast<BVCTestTabMock*>(tab_.get()).visibleURL = 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 =
       static_cast<OCMockObject*>(shareController_.get());
   [[shareControllerMock reject]
         shareWithData:[OCMArg any]
            controller:bvc_
          browserState:chrome_browser_state_.get()
@@ skipping 80 matching lines @@
       static_cast<OCMockObject*>(shareController_.get());
   [[shareControllerMock expect] cancelShareAnimated:NO];
   EXPECT_CALL(*this, OnCompletionCalled());
   [bvc_ clearPresentedStateWithCompletion:^{
     this->OnCompletionCalled();
   }];
   EXPECT_OCMOCK_VERIFY(shareControllerMock);
 }
 
 }  // namespace