Refactor Autofill for out of process iframes (OOPIF).

chrome/browser/prerender/prerender_tab_helper.cc

 // 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/prerender/prerender_tab_helper.h"
 
 #include "base/bind.h"
 #include "base/metrics/histogram.h"
 #include "base/time/time.h"
+#include "chrome/browser/password_manager/chrome_password_manager_client.h"
 #include "chrome/browser/prerender/prerender_histograms.h"
 #include "chrome/browser/prerender/prerender_local_predictor.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/prerender/prerender_manager_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "components/password_manager/core/browser/password_manager.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/resource_request_details.h"
@@ skipping 16 matching lines @@
     return;
   PrerenderLocalPredictor* local_predictor =
       prerender_manager->local_predictor();
   if (!local_predictor)
     return;
   local_predictor->OnTabHelperURLSeen(url, web_contents);
 }
 
 }  // namespace
 
-// static
-void PrerenderTabHelper::CreateForWebContentsWithPasswordManager(
-    content::WebContents* web_contents,
-    password_manager::PasswordManager* password_manager) {
-  if (!FromWebContents(web_contents)) {
-    web_contents->SetUserData(UserDataKey(),
-                              new PrerenderTabHelper(web_contents,
-                                                     password_manager));
-  }
-}
-
-PrerenderTabHelper::PrerenderTabHelper(
-    content::WebContents* web_contents,
-    password_manager::PasswordManager* password_manager)
+PrerenderTabHelper::PrerenderTabHelper(content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
       origin_(ORIGIN_NONE),
       next_load_is_control_prerender_(false),
       next_load_origin_(ORIGIN_NONE),
       weak_factory_(this) {
-  if (password_manager) {
-    // May be NULL in testing.
-    password_manager->AddSubmissionCallback(
-        base::Bind(&PrerenderTabHelper::PasswordSubmitted,
-                   weak_factory_.GetWeakPtr()));
+  ChromePasswordManagerClient* client =
+      ChromePasswordManagerClient::FromWebContents(web_contents);
+  // May be NULL during testing.
+  if (client) {
+    client->GetPasswordManager()->AddSubmissionCallback(base::Bind(
+        &PrerenderTabHelper::PasswordSubmitted, weak_factory_.GetWeakPtr()));
   }
 
   // Determine if this is a prerender.
   PrerenderManager* prerender_manager = MaybeGetPrerenderManager();
   if (prerender_manager &&
       prerender_manager->IsWebContentsPrerendering(web_contents, &origin_)) {
     navigation_type_ = NAVIGATION_TYPE_PRERENDERED;
   } else {
     navigation_type_ = NAVIGATION_TYPE_NORMAL;
   }
@@ skipping 197 matching lines @@
   prerender_manager->RecordPerceivedPageLoadTime(
       origin_, navigation_type_, perceived_page_load_time,
       fraction_plt_elapsed_at_swap_in, url_);
 
   // Reset state for the next navigation.
   navigation_type_ = NAVIGATION_TYPE_NORMAL;
   origin_ = ORIGIN_NONE;
 }
 
 }  // namespace prerender