[Password Generation] Fix bug where generation would never trigger on iframes

components/autofill/content/renderer/password_generation_agent.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 "components/autofill/content/renderer/password_generation_agent.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "components/autofill/content/common/autofill_messages.h"
@@ skipping 100 matching lines @@
       password_is_generated_(false),
       password_edited_(false),
       generation_popup_shown_(false),
       editing_popup_shown_(false),
       enabled_(password_generation::IsPasswordGenerationEnabled()) {
   VLOG(2) << "Password Generation is " << (enabled_ ? "Enabled" : "Disabled");
 }
 PasswordGenerationAgent::~PasswordGenerationAgent() {}
 
 void PasswordGenerationAgent::DidFinishDocumentLoad() {
-  if (render_frame()->GetWebFrame()->parent())
-    return;
+  // Update stats for main frame navigation.
+  if (!render_frame()->GetWebFrame()->parent()) {
+    // In every navigation, the IPC message sent by the password autofill
+    // manager to query whether the current form is blacklisted or not happens
+    // when the document load finishes, so we need to clear previous states
+    // here before we hear back from the browser. We only clear this state on
+    // main frame load as we don't want subframe loads to clear state that we
+    // have received from the main frame. Note that we assume there is only one
+    // account creation form, but there could be multiple password forms in
+    // each frame.
+    not_blacklisted_password_form_origins_.clear();
+    generation_enabled_forms_.clear();
+    generation_element_.reset();
+    possible_account_creation_forms_.clear();
 
-  // In every navigation, the IPC message sent by the password autofill manager
-  // to query whether the current form is blacklisted or not happens when the
-  // document load finishes, so we need to clear previous states here before we
-  // hear back from the browser. We only clear this state on main frame load
-  // as we don't want subframe loads to clear state that we have received from
-  // the main frame. Note that we assume there is only one account creation
-  // form, but there could be multiple password forms in each frame.
-  not_blacklisted_password_form_origins_.clear();
-  generation_enabled_forms_.clear();
-  generation_element_.reset();
-  possible_account_creation_forms_.clear();
+    // Log statistics after navigation so that we only log once per page.
+    if (generation_form_data_ &&
+        generation_form_data_->password_elements.empty()) {
+      password_generation::LogPasswordGenerationEvent(
+          password_generation::NO_SIGN_UP_DETECTED);
+    } else {
+      password_generation::LogPasswordGenerationEvent(
+          password_generation::SIGN_UP_DETECTED);
+    }
+    generation_form_data_.reset();
+    password_is_generated_ = false;
+    if (password_edited_) {
+      password_generation::LogPasswordGenerationEvent(
+          password_generation::PASSWORD_EDITED);
+    }
+    password_edited_ = false;
 
-  // Log statistics after navigation so that we only log once per page.
-  if (generation_form_data_ &&
-      generation_form_data_->password_elements.empty()) {
-    password_generation::LogPasswordGenerationEvent(
-        password_generation::NO_SIGN_UP_DETECTED);
-  } else {
-    password_generation::LogPasswordGenerationEvent(
-        password_generation::SIGN_UP_DETECTED);
+    if (generation_popup_shown_) {
+      password_generation::LogPasswordGenerationEvent(
+          password_generation::GENERATION_POPUP_SHOWN);
+    }
+    generation_popup_shown_ = false;
+
+    if (editing_popup_shown_) {
+      password_generation::LogPasswordGenerationEvent(
+          password_generation::EDITING_POPUP_SHOWN);
+    }
+    editing_popup_shown_ = false;
   }
-  generation_form_data_.reset();
-  password_is_generated_ = false;
-  if (password_edited_) {
-    password_generation::LogPasswordGenerationEvent(
-        password_generation::PASSWORD_EDITED);
-  }
-  password_edited_ = false;
-
-  if (generation_popup_shown_) {
-    password_generation::LogPasswordGenerationEvent(
-        password_generation::GENERATION_POPUP_SHOWN);
-  }
-  generation_popup_shown_ = false;
-
-  if (editing_popup_shown_) {
-    password_generation::LogPasswordGenerationEvent(
-        password_generation::EDITING_POPUP_SHOWN);
-  }
-  editing_popup_shown_ = false;
 
   FindPossibleGenerationForm();
 }
 
 void PasswordGenerationAgent::OnDynamicFormsSeen() {
   FindPossibleGenerationForm();
 }
 
 void PasswordGenerationAgent::FindPossibleGenerationForm() {
   if (!enabled_)
@@ skipping 32 matching lines @@
     std::vector<blink::WebInputElement> passwords;
     if (GetAccountCreationPasswordFields(forms[i], &passwords)) {
       AccountCreationFormData ac_form_data(
           make_linked_ptr(password_form.release()), passwords);
       possible_account_creation_forms_.push_back(ac_form_data);
     }
   }
 
   if (!possible_account_creation_forms_.empty()) {
     VLOG(2) << possible_account_creation_forms_.size()
-             << " possible account creation forms deteceted";
+            << " possible account creation forms deteceted";
     DetermineGenerationElement();
   }
 }
 
 bool PasswordGenerationAgent::ShouldAnalyzeDocument() const {
   // Make sure that this security origin is allowed to use password manager.
   // Generating a password that can't be saved is a bad idea.
   blink::WebSecurityOrigin origin =
       render_frame()->GetWebFrame()->document().securityOrigin();
   if (!origin.canAccessPasswordManager()) {
@@ skipping 196 matching lines @@
       *generation_form_data_->form));
 
   editing_popup_shown_ = true;
 }
 
 void PasswordGenerationAgent::HidePopup() {
   Send(new AutofillHostMsg_HidePasswordGenerationPopup(routing_id()));
 }
 
 }  // namespace autofill