[password autofill] Remove references to PasswordForm from RenderViewImpl

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/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/time/time.h"
 #include "chrome/browser/predictors/logged_in_predictor_table.h"
@@ skipping 132 matching lines @@
   // Bitmap of what the last swapped in prerendered tab looked like at swapin,
   // and the WebContents that it was swapped into.
   scoped_ptr<SkBitmap> bitmap_;
   WebContents* bitmap_web_contents_;
 
   base::WeakPtrFactory<PixelStats> weak_factory_;
 
   PrerenderTabHelper* tab_helper_;
 };
 
-PrerenderTabHelper::PrerenderTabHelper(content::WebContents* web_contents)
+// static
+void PrerenderTabHelper::CreateForWebContentsWithPasswordManager(

[tburkard, 2013/07/25 16:59:17]

Can't this be done as a template in web_contents_user_data, analogous to the
formerly used implementation, so that other classes who might need this can use
it as well?

[Garrett Casto, 2013/07/25 17:34:06]

Do you mean something generic like
WebContentsUserData::CreateForWebContentsWithArgs(), or actually
WebContentsUserData::CreateForWebContentsWithPasswordManager(). I could possibly
see some use for the former, but the latter seems too specific, especially since
it would be in content referencing something in chrome. In either case, there
aren't that many classes that make use of this right now, so I doubt it's worth
the effort.

+    content::WebContents* web_contents,
+    PasswordManager* password_manager) {
+  if (!FromWebContents(web_contents)) {
+    web_contents->SetUserData(UserDataKey(),
+                              new PrerenderTabHelper(web_contents,
+                                                     password_manager));
+  }
+}
+
+PrerenderTabHelper::PrerenderTabHelper(content::WebContents* web_contents,
+                                       PasswordManager* password_manager)
     : content::WebContentsObserver(web_contents),
       weak_factory_(this) {
+  DCHECK(password_manager);
+  password_manager->AddSubmissionObserver(this);
 }
 
 PrerenderTabHelper::~PrerenderTabHelper() {
 }
 
 void PrerenderTabHelper::ProvisionalChangeToMainFrameUrl(
     const GURL& url,
     content::RenderViewHost* render_view_host) {
   url_ = url;
   RecordEvent(EVENT_MAINFRAME_CHANGE);
@@ skipping 70 matching lines @@
       bool is_error_page,
       bool is_iframe_srcdoc,
       content::RenderViewHost* render_view_host) {
   if (is_main_frame) {
     // Record the beginning of a new PPLT navigation.
     pplt_load_start_ = base::TimeTicks::Now();
     actual_load_start_ = base::TimeTicks();
   }
 }
 
-void PrerenderTabHelper::DidNavigateAnyFrame(
-      const content::LoadCommittedDetails& details,
-      const content::FrameNavigateParams& params) {
+void PrerenderTabHelper::PasswordSubmitted(const content::PasswordForm& form) {
   PrerenderManager* prerender_manager = MaybeGetPrerenderManager();
-  if (params.password_form.origin.is_valid() && prerender_manager) {
-    prerender_manager->RecordLikelyLoginOnURL(params.url);
+  if (prerender_manager) {
+    prerender_manager->RecordLikelyLoginOnURL(form.origin);
     RecordEvent(EVENT_LOGIN_ACTION_ADDED);
   }
 }
 
 PrerenderManager* PrerenderTabHelper::MaybeGetPrerenderManager() const {
   return PrerenderManagerFactory::GetForProfile(
       Profile::FromBrowserContext(web_contents()->GetBrowserContext()));
 }
 
 bool PrerenderTabHelper::IsPrerendering() {
@@ skipping 57 matching lines @@
 
 void PrerenderTabHelper::RecordEventIfLoggedInURLResult(
     PrerenderTabHelper::Event event,
     scoped_ptr<bool> is_present,
     scoped_ptr<bool> lookup_succeeded) {
   if (*lookup_succeeded && *is_present)
     RecordEvent(event);
 }
 
 }  // namespace prerender