AutoFill: Remove one level of indirection when clearing a previewed form.

BUG=48857
TEST=none

Review URL: http://codereview.chromium.org/3029061

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55173 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 8 insertions, 14 deletions

diff --git a/chrome/renderer/autofill_helper.cc b/chrome/renderer/autofill_helper.cc
index ea1b4a7..982223d 100644
--- a/chrome/renderer/autofill_helper.cc
+++ b/chrome/renderer/autofill_helper.cc
@@ -186,13 +186,7 @@ void AutoFillHelper::DidAcceptAutoFillSuggestion(const WebNode& node,
 }
 
 void AutoFillHelper::DidClearAutoFillSelection(const WebNode& node) {
-  webkit_glue::FormData form;
-  const WebFormControlElement element = node.toConst<WebFormControlElement>();
-  if (!form_manager_.FindFormWithFormControlElement(
-          element, FormManager::REQUIRE_NONE, &form)) {
-    return;
-  }
-  form_manager_.ClearPreviewedForm(form);
+  form_manager_.ClearPreviewedFormWithNode(node);
 }
 
 void AutoFillHelper::FrameContentsAvailable(WebFrame* frame) {
diff --git a/chrome/renderer/form_manager.cc b/chrome/renderer/form_manager.cc
index ffe43bf..048f347 100644
--- a/chrome/renderer/form_manager.cc
+++ b/chrome/renderer/form_manager.cc
@@ -618,9 +618,9 @@ bool FormManager::ClearFormWithNode(const WebKit::WebNode& node) {
   return true;
 }
 
-bool FormManager::ClearPreviewedForm(const FormData& form) {
+bool FormManager::ClearPreviewedFormWithNode(const WebKit::WebNode& node) {
   FormElement* form_element = NULL;
-  if (!FindCachedFormElement(form, &form_element))
+  if (!FindCachedFormElementWithNode(node, &form_element))
     return false;
 
   for (size_t i = 0; i < form_element->control_elements.size(); ++i) {
diff --git a/chrome/renderer/form_manager.h b/chrome/renderer/form_manager.h
index 3528757..ce34f9a 100644
--- a/chrome/renderer/form_manager.h
+++ b/chrome/renderer/form_manager.h
@@ -102,9 +102,9 @@ class FormManager {
   bool ClearFormWithNode(const WebKit::WebNode& node);
 
   // Clears the placeholder values and the auto-filled background for any fields
-  // in |form| that have been previewed.  Returns false if the form is not
-  // found.
-  bool ClearPreviewedForm(const webkit_glue::FormData& form);
+  // in the form containing |node| that have been previewed. Returns false if
+  // the form is not found.
+  bool ClearPreviewedFormWithNode(const WebKit::WebNode& node);
 
   // Resets the stored set of forms.
   void Reset();
diff --git a/chrome/renderer/form_manager_unittest.cc b/chrome/renderer/form_manager_unittest.cc
index 48c8054..a72b601 100644
--- a/chrome/renderer/form_manager_unittest.cc
+++ b/chrome/renderer/form_manager_unittest.cc
@@ -2304,7 +2304,7 @@ TEST_F(FormManagerTest, ClearFormWithNode) {
                 0)));
 }
 
-TEST_F(FormManagerTest, ClearPreviewedForm) {
+TEST_F(FormManagerTest, ClearPreviewedFormWithNode) {
   LoadHTML("<FORM name=\"TestForm\" action=\"http://buh.com\" method=\"post\">"
            "  <INPUT type=\"text\" id=\"firstname\" value=\"Wyatt\"/>"
            "  <INPUT type=\"text\" id=\"lastname\"/>"
@@ -2339,7 +2339,7 @@ TEST_F(FormManagerTest, ClearPreviewedForm) {
   email.setSuggestedValue(ASCIIToUTF16("wyatt@earp.com"));
 
   // Clear the previewed fields.
-  EXPECT_TRUE(form_manager.ClearPreviewedForm(forms[0]));
+  EXPECT_TRUE(form_manager.ClearPreviewedFormWithNode(firstname));
 
   // Fields with non-empty values are not modified.
   EXPECT_EQ(ASCIIToUTF16("Wyatt"), firstname.value());