Password bubble: Move WebContents completely into the UI controller.

chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc

 // Copyright 2013 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.
 
 #include "chrome/browser/ui/views/passwords/manage_passwords_bubble_view.h"
 
 #include "base/metrics/histogram.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
@@ skipping 124 matching lines @@
 }
 
 ManagePasswordsBubbleView::ManagePasswordsBubbleView(
     content::WebContents* web_contents,
     views::View* anchor_view,
     ManagePasswordsIconView* icon_view,
     BubbleDisplayReason reason)
     : BubbleDelegateView(anchor_view,
                          anchor_view ? views::BubbleBorder::TOP_RIGHT
                                      : views::BubbleBorder::NONE),
-      manage_passwords_bubble_model_(
-          new ManagePasswordsBubbleModel(web_contents)),
       icon_view_(icon_view) {
+  manage_passwords_bubble_model_ = new ManagePasswordsBubbleModel(
+      ManagePasswordsBubbleUIController::FromWebContents(web_contents));
+
   // Compensate for built-in vertical padding in the anchor view's image.
   set_anchor_view_insets(gfx::Insets(5, 0, 5, 0));
   set_notify_enter_exit_on_child(true);
 
   BubbleDisplayDisposition disposition = AUTOMATIC_WITH_PASSWORD_PENDING;
   if (reason == USER_ACTION) {
     // TODO(mkwst): Deal with "Never save passwords" once we've decided how that
     // flow should work.
     disposition = manage_passwords_bubble_model_->WaitingToSavePassword()
                       ? MANUAL_WITH_PASSWORD_PENDING
@@ skipping 263 matching lines @@
     case SavePasswordRefusalComboboxModel::INDEX_NEVER_FOR_THIS_SITE:
       manage_passwords_bubble_model_->OnNeverForThisSiteClicked();
       reason = CLICKED_NEVER;
       break;
     default:
       NOTREACHED();
       break;
   }
   Close(reason);
 }