Remove the public detach method from password controller.

Please see detail description in the bug.

Bug: 875176
Cq-Include-Trybots: luci.chromium.try:ios-simulator-full-configs;master.tryserver.chromium.mac:ios-simulator-cronet
Change-Id: Ib6c09079db1475deca5983a929335eda6e1bf1b3
Reviewed-on: https://chromium-review.googlesource.com/1179546Reviewed-by: Vasilii Sukhanov <vasilii@chromium.org>
Reviewed-by: Hiroshi Ichikawa <ichikawa@chromium.org>
Commit-Queue: Scott Wu <scottwu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#584397}

ios/chrome/browser/passwords/password_controller.h

@@ -78,10 +78,6 @@ class PasswordManagerDriver;
 
 - (instancetype)init NS_UNAVAILABLE;
 
-// Releases all tab-specific members. Must be called when the Tab is closing,
-// otherwise invalid memory might be accessed during destruction.
-- (void)detach;
-
 @end
 
 #endif  // IOS_CHROME_BROWSER_PASSWORDS_PASSWORD_CONTROLLER_H_

ios/chrome/browser/passwords/password_controller.mm

@@ -112,9 +112,6 @@ void LogSuggestionShown(PasswordSuggestionType type) {
 
 @interface PasswordController ()
 
-// This is set to YES as soon as the associated WebState is destroyed.
-@property(readonly) BOOL isWebStateDestroyed;
-
 // View controller for auto sign-in notification, owned by this
 // PasswordController.
 @property(nonatomic, strong)
@@ -281,8 +278,6 @@ bool GetPageURLAndCheckTrustLevel(web::WebState* web_state, GURL* page_url) {
       formActivityObserverBridge_;
 }
 
-@synthesize isWebStateDestroyed = _isWebStateDestroyed;
-
 @synthesize baseViewController = _baseViewController;
 
 @synthesize dispatcher = _dispatcher;
@@ -342,13 +337,9 @@ bool GetPageURLAndCheckTrustLevel(web::WebState* web_state, GURL* page_url) {
 }
 
 - (void)dealloc {
-  [self detach];
-
   if (webState_) {
-    formActivityObserverBridge_.reset();
+    webState_->RemoveScriptCommandCallback(kCommandPrefix);
     webState_->RemoveObserver(webStateObserverBridge_.get());
-    webStateObserverBridge_.reset();
-    webState_ = nullptr;
   }
 }
 
@@ -362,21 +353,6 @@ bool GetPageURLAndCheckTrustLevel(web::WebState* web_state, GURL* page_url) {
   return webState_ ? webState_->GetLastCommittedURL() : GURL::EmptyGURL();
 }
 
-- (void)detach {
-  if (webState_) {
-    formActivityObserverBridge_.reset();
-    webState_->RemoveScriptCommandCallback(kCommandPrefix);
-    webState_->RemoveObserver(webStateObserverBridge_.get());
-    webStateObserverBridge_.reset();
-    webState_ = nullptr;
-  }
-
-  passwordManagerDriver_.reset();
-  passwordManager_.reset();
-  passwordManagerClient_.reset();
-  credentialManager_.reset();
-}
-
 #pragma mark -
 #pragma mark Properties
 
@@ -424,8 +400,7 @@ bool GetPageURLAndCheckTrustLevel(web::WebState* web_state, GURL* page_url) {
   // TODO(crbug.com/418827): Fix this by passing in more data from the JS side.
   id completionHandler = ^(BOOL found, const autofill::PasswordForm& form) {
     PasswordController* strongSelf = weakSelf;
-    if (!strongSelf || [strongSelf isWebStateDestroyed] ||
-        !strongSelf.passwordManager) {
+    if (!strongSelf || !strongSelf->webState_ || !strongSelf.passwordManager) {
       return;
     }
     if (formInMainFrame) {
@@ -492,8 +467,17 @@ bool GetPageURLAndCheckTrustLevel(web::WebState* web_state, GURL* page_url) {
 
 - (void)webStateDestroyed:(web::WebState*)webState {
   DCHECK_EQ(webState_, webState);
-  _isWebStateDestroyed = YES;
-  [self detach];
+  if (webState_) {
+    formActivityObserverBridge_.reset();
+    webState_->RemoveScriptCommandCallback(kCommandPrefix);
+    webState_->RemoveObserver(webStateObserverBridge_.get());
+    webStateObserverBridge_.reset();
+    webState_ = nullptr;
+  }
+  passwordManagerDriver_.reset();
+  passwordManager_.reset();
+  passwordManagerClient_.reset();
+  credentialManager_.reset();
 }
 
 #pragma mark - Private methods.
@@ -866,7 +850,7 @@ bool GetPageURLAndCheckTrustLevel(web::WebState* web_state, GURL* page_url) {
   if (!form)
     return NO;
 
-  if (![self isWebStateDestroyed]) {
+  if (webState_) {
     self.passwordManager->OnPasswordFormSubmitted(self.passwordManagerDriver,
                                                   *form);
     return YES;

ios/chrome/browser/passwords/password_controller_unittest.mm

@@ -1159,7 +1159,6 @@ TEST_F(PasswordControllerTestSimple, SaveOnNonHTMLLandingPage) {
   web_state.SetContentIsHTML(false);
   web_state.SetCurrentURL(GURL("https://example.com"));
   [passwordController webState:&web_state didLoadPageWithSuccess:YES];
-  [passwordController detach];
 }
 
 // Tests that an HTTP page without a password field does not update the SSL

ios/chrome/browser/passwords/password_tab_helper.mm

@@ -54,6 +54,5 @@ PasswordTabHelper::PasswordTabHelper(web::WebState* web_state)
 
 void PasswordTabHelper::WebStateDestroyed(web::WebState* web_state) {
   web_state->RemoveObserver(this);
-  [controller_ detach];
   controller_ = nil;
 }