Remove TabModel -replaceWebState: method.

ios/chrome/browser/tabs/tab_model_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 <objc/runtime.h>
 
 #include "base/files/file_path.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/strings/sys_string_conversions.h"
 #include "ios/chrome/browser/browser_state/test_chrome_browser_state.h"
 #include "ios/chrome/browser/browser_state/test_chrome_browser_state_manager.h"
 #include "ios/chrome/browser/chrome_url_constants.h"
 #include "ios/chrome/browser/infobars/infobar_manager_impl.h"
+#include "ios/chrome/browser/sessions/ios_chrome_session_tab_helper.h"
 #import "ios/chrome/browser/sessions/session_window.h"
 #import "ios/chrome/browser/sessions/test_session_service.h"
 #import "ios/chrome/browser/tabs/tab.h"
 #import "ios/chrome/browser/tabs/tab_model.h"
 #import "ios/chrome/browser/tabs/tab_model_observer.h"
 #import "ios/chrome/browser/tabs/tab_private.h"
 #import "ios/chrome/browser/web/chrome_web_client.h"
 #include "ios/chrome/test/ios_chrome_scoped_testing_chrome_browser_state_manager.h"
 #import "ios/web/navigation/crw_session_controller.h"
 #import "ios/web/navigation/navigation_manager_impl.h"
@@ skipping 31 matching lines @@
                       browserState:(ios::ChromeBrowserState*)browserState
                           tabModel:(TabModel*)tabModel;
 @end
 
 @implementation TabTest
 
 - (instancetype)initWithWindowName:(NSString*)windowName
               lastVisitedTimestamp:(double)lastVisitedTimestamp
                       browserState:(ios::ChromeBrowserState*)browserState
                           tabModel:(TabModel*)tabModel {
-  self = [super initWithWindowName:windowName
-                            opener:nil
-                       openedByDOM:NO
-                             model:tabModel
-                      browserState:browserState];
-  if (self) {
     id webControllerMock =
         [OCMockObject niceMockForClass:[CRWWebController class]];
 
     auto webStateImpl = base::MakeUnique<WebStateImpl>(browserState);
     webStateImpl->SetWebController(webControllerMock);
     webStateImpl->GetNavigationManagerImpl().InitializeSession(
         windowName, @"opener", NO, -1);
     [webStateImpl->GetNavigationManagerImpl().GetSessionController()
         setLastVisitedTimestamp:lastVisitedTimestamp];
 
     WebStateImpl* webStateImplPtr = webStateImpl.get();
     [[[webControllerMock stub] andReturnValue:OCMOCK_VALUE(webStateImplPtr)]
         webStateImpl];
     BOOL yes = YES;
     [[[webControllerMock stub] andReturnValue:OCMOCK_VALUE(yes)] isViewAlive];
 
-    [self replaceWebState:std::move(webStateImpl)];
+    if ((self = [super initWithWebState:std::move(webStateImpl)

[marq (ping after 24h), 2017/02/07 18:39:04]

Prefer to keep the superclass init at the top of the method unless there's a
good reason not to.

If you don't, please fix the indent for the lines above.

[sdefresne, 2017/02/08 09:28:57]

There's a good reason: I need to create and WebStateImpl and its mock
CRWWebController before I can invoke the super class initialiser.

Indentation fixed (I expected that "git cl format" would have reformatted them
but then it only reformat the modified code and "git diff" was over optimistic
in not marking the body of the "if" as modified).

+                                  model:tabModel
+                       attachTabHelpers:NO])) {
+      IOSChromeSessionTabHelper::CreateForWebState(self.webState);
   }
   return self;
 }
 
 @end
 
 @interface TabModel (VisibleForTesting)
 - (SessionWindowIOS*)windowForSavingSession;
 @end
 
@@ skipping 784 matching lines @@
   // Restoring TabModel session sends asynchronous tasks to IO thread, wait
   // for them to complete after destroying the TabModel.
   base::RunLoop().RunUntilIdle();
 
   // Clean up.
   EXPECT_TRUE([[NSFileManager defaultManager] removeItemAtPath:stashPath
                                                          error:nullptr]);
 }
 
 }  // anonymous namespace