Remove dangling ManagePasswordsBubbleModel pointers. Test that different password bubbles don't pin…

chrome/browser/ui/cocoa/passwords/account_chooser_view_controller.mm

 // Copyright 2015 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 "chrome/browser/ui/cocoa/passwords/account_chooser_view_controller.h"
 
 #include <cmath>
 
 #include "base/strings/sys_string_conversions.h"
 #import "chrome/browser/ui/cocoa/passwords/account_avatar_fetcher_manager.h"
@@ skipping 24 matching lines @@
 }
 @end
 
 @interface AccountChooserViewController()
 - (void)onCancelClicked:(id)sender;
 + (NSArray*)credentialItemsFromBridge:(AccountChooserBridge*)bridge
                             delegate:(id<CredentialItemDelegate>)delegate;
 @end
 
 @implementation AccountChooserViewController
+@synthesize bridge = bridge_;
 
-- (id)initWithBridge:(AccountChooserBridge*)bridge {
+- (instancetype)initWithBridge:(AccountChooserBridge*)bridge {
   base::scoped_nsobject<AccountAvatarFetcherManager> avatarManager(
       [[AccountAvatarFetcherManager alloc]
            initWithRequestContext:bridge->GetRequestContext()]);
   return [self initWithBridge:bridge avatarManager:avatarManager];
 }
 
 - (void)dealloc {
   [credentialsView_ setDelegate:nil];
   [credentialsView_ setDataSource:nil];
   [super dealloc];
@@ skipping 70 matching lines @@
 
   const CGFloat frameHeight = NSMaxY([titleView_ frame]) + kFramePadding;
   [view setFrame:NSMakeRect(0, 0, kDesiredBubbleWidth, frameHeight)];
 
   [self setView:view];
 }
 
 - (BOOL)textView:(NSTextView*)textView
     clickedOnLink:(id)link
           atIndex:(NSUInteger)charIndex {
-  bridge_->GetDialogController()->OnSmartLockLinkClicked();
+  if (bridge_ && bridge_->GetDialogController())
+    bridge_->GetDialogController()->OnSmartLockLinkClicked();
   return YES;
 }
 
 - (void)onCancelClicked:(id)sender {
-  bridge_->PerformClose();
+  if (bridge_)
+    bridge_->PerformClose();
 }
 
 - (void)fetchAvatar:(const GURL&)avatarURL forView:(CredentialItemView*)view {
   [avatarManager_ fetchAvatar:avatarURL forView:view];
 }
 
 + (NSArray*)credentialItemsFromBridge:(AccountChooserBridge*)bridge
                              delegate:(id<CredentialItemDelegate>)delegate {
   base::scoped_nsobject<NSMutableArray> items([[NSMutableArray alloc] init]);
   PasswordDialogController* controller = bridge->GetDialogController();
@@ skipping 37 matching lines @@
 - (NSCell*)tableView:(NSTableView*)tableView
     dataCellForTableColumn:(NSTableColumn*)tableColumn
                        row:(NSInteger)row {
   return [[[CredentialItemCell alloc]
       initWithView:[credentialItems_.get() objectAtIndex:row]] autorelease];
 }
 
 - (void)tableViewSelectionDidChange:(NSNotification *)notification {
   CredentialItemView* item =
       [credentialItems_.get() objectAtIndex:[credentialsView_ selectedRow]];
-  bridge_->GetDialogController()->OnChooseCredentials(item.passwordForm,
-                                                      item.credentialType);
+  if (bridge_ && bridge_->GetDialogController()) {
+    bridge_->GetDialogController()->OnChooseCredentials(item.passwordForm,
+                                                        item.credentialType);
+  }
 }
 
 @end
 
 @implementation AccountChooserViewController(Testing)
 
-- (id)initWithBridge:(AccountChooserBridge*)bridge
-      avatarManager:(AccountAvatarFetcherManager*)avatarManager {
+- (instancetype)initWithBridge:(AccountChooserBridge*)bridge
+                 avatarManager:(AccountAvatarFetcherManager*)avatarManager {
   DCHECK(bridge);
   if (self = [super initWithNibName:nil bundle:nil]) {
     bridge_ = bridge;
     avatarManager_.reset([avatarManager retain]);
   }
   return self;
 }
 
 - (NSButton*)cancelButton {
   return cancelButton_;
 }
 
 - (NSTableView*)credentialsView {
   return credentialsView_;
 }
 
 - (NSTextView*)titleView {
   return titleView_;
 }
 
 @end