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

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

 // Copyright 2014 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/passwords_bubble_controller.h"
 
 #include "base/mac/scoped_nsobject.h"
 #include "chrome/browser/ui/browser_finder.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/info_bubble_view.h"
@@ skipping 50 matching lines @@
   // Find the next view controller.
   currentController_.reset();
   if (model_->state() == password_manager::ui::PENDING_PASSWORD_STATE) {
     currentController_.reset([[SavePendingPasswordViewController alloc]
         initWithDelegate:self]);
   } else if (model_->state() ==
              password_manager::ui::PENDING_PASSWORD_UPDATE_STATE) {
     currentController_.reset([[UpdatePendingPasswordViewController alloc]
         initWithDelegate:self]);
   } else if (model_->state() == password_manager::ui::CONFIRMATION_STATE) {
-    currentController_.reset(
-        [[ManagePasswordsBubbleConfirmationViewController alloc]
-            initWithModel:model_
-                 delegate:self]);
+    currentController_.reset([[ConfirmationPasswordSavedViewController alloc]
+        initWithDelegate:self]);
   } else if (model_->state() == password_manager::ui::MANAGE_STATE) {
     currentController_.reset(
-        [[ManagePasswordsBubbleManageViewController alloc]
-            initWithModel:model_
-                 delegate:self]);
+        [[ManagePasswordsViewController alloc] initWithDelegate:self]);
   } else if (model_->state() == password_manager::ui::AUTO_SIGNIN_STATE) {
     currentController_.reset(
-        [[ManagePasswordsBubbleAutoSigninViewController alloc]
-            initWithModel:model_
-                 delegate:self]);
+        [[AutoSigninViewController alloc] initWithDelegate:self]);
   } else {
     NOTREACHED();
   }
 }
 
 - (void)performLayout {
   if (!currentController_)
     return;
 
   // Update the window.
@@ skipping 40 matching lines @@
     height += info_bubble::kBubbleArrowHeight;
     x += info_bubble::kBubbleArrowXOffset +
          (0.5 * info_bubble::kBubbleArrowWidth);
   }
 
   [window setFrame:NSMakeRect(x, y, width, height)
            display:YES
            animate:[window isVisible]];
 }
 
-#pragma mark ManagePasswordsBubbleContentViewDelegate
+#pragma mark BasePasswordsContentViewDelegate
 
 - (void)viewShouldDismiss {
   [self close];
 }
 
 - (ManagePasswordsBubbleModel*)model {
   return model_;
 }
 
 @end
 
 @implementation ManagePasswordsBubbleController (Testing)
 
 - (NSViewController*)currentController {
   return currentController_.get();
 }
 
 @end