Move ownership of Password(Generation)Manager to ContentPasswordDriver.

chrome/browser/ui/cocoa/browser_window_cocoa.mm

 // Copyright (c) 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.
 
 #include "chrome/browser/ui/cocoa/browser_window_cocoa.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/mac/mac_util.h"
 #import "base/mac/sdk_forward_declarations.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/download/download_shelf.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/fullscreen.h"
-#include "chrome/browser/password_manager/password_manager.h"
+#include "chrome/browser/password_manager/password_manager_delegate_impl.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_command_controller.h"
 #include "chrome/browser/ui/browser_commands_mac.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window_state.h"
 #import "chrome/browser/ui/cocoa/browser/avatar_base_controller.h"
 #import "chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller.h"
 #import "chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.h"
@@ skipping 667 matching lines @@
     const gfx::Rect& rect,
     const autofill::PasswordForm& form,
     autofill::PasswordGenerator* password_generator) {
   WebContents* web_contents =
       browser_->tab_strip_model()->GetActiveWebContents();
   // We want to point to the middle of the rect instead of the right side.
   NSPoint point = GetPointForBubble(web_contents,
                                     rect.x() + rect.width()/2,
                                     rect.bottom());
 
-  PasswordGenerationBubbleController* controller =
-      [[PasswordGenerationBubbleController alloc]
-        initWithWindow:browser_->window()->GetNativeWindow()
-            anchoredAt:point
-        renderViewHost:web_contents->GetRenderViewHost()
-        passwordManager:PasswordManager::FromWebContents(web_contents)
-        usingGenerator:password_generator
-               forForm:form];
+  PasswordGenerationBubbleController* controller = [
+          [PasswordGenerationBubbleController alloc]
+       initWithWindow:browser_->window()->GetNativeWindow()
+           anchoredAt:point
+       renderViewHost:web_contents->GetRenderViewHost()
+      passwordManager:PasswordManagerDelegateImpl::GetManagerFromWebContents(
+                          web_contents)
+       usingGenerator:password_generator
+              forForm:form];
   [controller showWindow:nil];
 }
 
 int
 BrowserWindowCocoa::GetRenderViewHeightInsetWithDetachedBookmarkBar() {
   if (browser_->bookmark_bar_state() != BookmarkBar::DETACHED)
     return 0;
   // TODO(sail): please make this work with cocoa, then enable
   // BrowserTest.GetSizeForNewRenderView and
   // WebContentsImplBrowserTest.GetSizeForNewRenderView.
@@ skipping 19 matching lines @@
   // further, both by another H, i.e. WebContentsView's height becomes
   // A.height() + H and RenderWidgetHostView's height becomes A.height() + 2H.
   // Strangely, the RenderWidgetHostView for the previous navigation entry also
   // gets enlarged by H.
   // I believe these "automatic" resizing are caused by setAutoresizingMask of
   // of the cocoa view in WebContentsViewMac, which defeats the purpose of
   // WebContentsDelegate::GetSizeForNewRenderView i.e. to prevent resizing of
   // RenderWidgetHostView in (2) and (3).
   return 0;
 }