PasswordController initialization: WebStateObserverBridge to the end

ios/chrome/browser/passwords/password_controller.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 "ios/chrome/browser/passwords/password_controller.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <memory>
@@ skipping 223 matching lines @@
 }  // namespace
 
 @implementation PasswordController {
   std::unique_ptr<PasswordManager> passwordManager_;
   std::unique_ptr<PasswordGenerationManager> passwordGenerationManager_;
   std::unique_ptr<PasswordManagerClient> passwordManagerClient_;
   std::unique_ptr<PasswordManagerDriver> passwordManagerDriver_;
   base::scoped_nsobject<PasswordGenerationAgent> passwordGenerationAgent_;
 
   JsPasswordManager* passwordJsManager_;  // weak
+  web::WebState* webState_;               // weak

[vasilii, 2016/05/10 12:38:47]

Why is the new member required?

[vabr (Chromium), 2016/05/10 12:48:47]

Before it, the WebState was accessed through the WebStateObserverBridge. Caching
the WebState pointer passed to the initializer method avoids the need to create
the bridge before being able to vend the WebState.

 
   // The pending form data.
   std::unique_ptr<autofill::PasswordFormFillData> formData_;
 
   // Bridge to observe WebState from Objective-C.
   std::unique_ptr<web::WebStateObserverBridge> webStateObserverBridge_;
 }
 
 @synthesize isWebStateDestroyed = isWebStateDestroyed_;
 
 - (instancetype)initWithWebState:(web::WebState*)webState
              passwordsUiDelegate:(id<PasswordsUiDelegate>)UIDelegate {
   self = [self initWithWebState:webState
             passwordsUiDelegate:UIDelegate
                          client:nullptr];
   return self;
 }
 
 - (instancetype)initWithWebState:(web::WebState*)webState
              passwordsUiDelegate:(id<PasswordsUiDelegate>)UIDelegate
                           client:(std::unique_ptr<PasswordManagerClient>)
                                      passwordManagerClient {
   DCHECK(webState);
   self = [super init];
   if (self) {
-    webStateObserverBridge_.reset(
-        new web::WebStateObserverBridge(webState, self));
+    webState_ = webState;
     if (passwordManagerClient)
       passwordManagerClient_ = std::move(passwordManagerClient);
     else
       passwordManagerClient_.reset(new IOSChromePasswordManagerClient(self));
     passwordManager_.reset(new PasswordManager(passwordManagerClient_.get()));
     passwordManagerDriver_.reset(new IOSChromePasswordManagerDriver(self));
     if (experimental_flags::IsPasswordGenerationEnabled() &&
         !passwordManagerClient_->IsOffTheRecord()) {
       passwordGenerationManager_.reset(new PasswordGenerationManager(
           passwordManagerClient_.get(), passwordManagerDriver_.get()));
       passwordGenerationAgent_.reset([[PasswordGenerationAgent alloc]
                initWithWebState:webState
                 passwordManager:passwordManager_.get()
           passwordManagerDriver:passwordManagerDriver_.get()
             passwordsUiDelegate:UIDelegate]);
     }
 
     passwordJsManager_ = base::mac::ObjCCastStrict<JsPasswordManager>(
         [webState->GetJSInjectionReceiver()
             instanceOfClass:[JsPasswordManager class]]);
+    webStateObserverBridge_.reset(
+        new web::WebStateObserverBridge(webState, self));
   }
   return self;
 }
 
 - (instancetype)init {
   NOTREACHED();
   return nil;
 }
 
 - (void)dealloc {
   [self detach];
   [super dealloc];
 }
 
 - (ios::ChromeBrowserState*)browserState {
-  return webStateObserverBridge_ && webStateObserverBridge_->web_state()
-             ? ios::ChromeBrowserState::FromBrowserState(
-                   webStateObserverBridge_->web_state()->GetBrowserState())
-             : nullptr;
+  return webState_ ? ios::ChromeBrowserState::FromBrowserState(
+                         webState_->GetBrowserState())
+                   : nullptr;
 }
 
 - (const GURL&)lastCommittedURL {
   if (!webStateObserverBridge_ || !webStateObserverBridge_->web_state())
     return GURL::EmptyGURL();
   return webStateObserverBridge_->web_state()->GetLastCommittedURL();
 }
 
 - (void)detach {
+  webState_ = nullptr;
   webStateObserverBridge_.reset();
   passwordGenerationAgent_.reset();
   passwordGenerationManager_.reset();
   passwordManagerDriver_.reset();
   passwordManager_.reset();
   passwordManagerClient_.reset();
 }
 
 - (void)findAndFillPasswordForms:(NSString*)username
                         password:(NSString*)password
@@ skipping 492 matching lines @@
 
 - (PasswordManager*)passwordManager {
   return passwordManager_.get();
 }
 
 - (JsPasswordManager*)passwordJsManager {
   return passwordJsManager_;
 }
 
 @end