[Autofill] Send Autofill upload when active form loses focus.

components/autofill/content/renderer/autofill_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/autofill_agent.h"
 
 #include <tuple>
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
@@ skipping 241 matching lines @@
 void AutofillAgent::DidChangeScrollOffset() {
   if (IsKeyboardAccessoryEnabled())
     return;
 
   HidePopup();
 }
 
 void AutofillAgent::FocusedNodeChanged(const WebNode& node) {
   HidePopup();
 
-  if (node.isNull() || !node.isElementNode())
+  if (node.isNull() || !node.isElementNode()) {
+    if (!last_interacted_form_.isNull()) {
+      // Focus moved away from the last interacted form to somewhere else on
+      // the page.
+      Send(new AutofillHostMsg_FocusNoLongerOnForm(routing_id()));
+    }
     return;
+  }
 
   WebElement web_element = node.toConst<WebElement>();
   const WebInputElement* element = toWebInputElement(&web_element);
+  if (!element || (!last_interacted_form_.isNull() &&
+                   last_interacted_form_ != element->form())) {
+    // The focused element is not part of the last interacted form (could be
+    // in a different form).
+    Send(new AutofillHostMsg_FocusNoLongerOnForm(routing_id()));
+    return;
+  }
 
   if (!element || !element->isEnabled() || element->isReadOnly() ||
       !element->isTextField())
     return;
 
   element_ = *element;
 }
 
 void AutofillAgent::FocusChangeComplete() {
   WebDocument doc = render_frame()->GetWebFrame()->document();
@@ skipping 235 matching lines @@
 
 void AutofillAgent::OnFillForm(int query_id, const FormData& form) {
   if (query_id != autofill_query_id_)
     return;
 
   was_query_node_autofilled_ = element_.isAutofilled();
   form_util::FillForm(form, element_);
   if (!element_.form().isNull())
     last_interacted_form_ = element_.form();
 
-  Send(new AutofillHostMsg_DidFillAutofillFormData(routing_id(),
+  Send(new AutofillHostMsg_DidFillAutofillFormData(routing_id(), form,
                                                    base::TimeTicks::Now()));
 }
 
 void AutofillAgent::OnFirstUserGestureObservedInTab() {
   password_autofill_agent_->FirstUserGestureObserved();
 }
 
 void AutofillAgent::OnPing() {
   Send(new AutofillHostMsg_PingAck(routing_id()));
 }
@@ skipping 282 matching lines @@
 
 void AutofillAgent::LegacyAutofillAgent::OnDestruct() {
   // No-op. Don't delete |this|.
 }
 
 void AutofillAgent::LegacyAutofillAgent::FocusChangeComplete() {
   agent_->FocusChangeComplete();
 }
 
 }  // namespace autofill