Refactor detection of account creation forms and fix two minor issues.

chrome/renderer/autofill/password_generation_manager_browsertest.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 "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/autofill_messages.h"
 #include "chrome/renderer/autofill/password_generation_manager.h"
 #include "chrome/test/base/chrome_render_view_test.h"
@@ skipping 76 matching lines @@
 const char kSigninFormHTML[] =
     "<FORM name = 'blah' action = 'http://www.random.com/'> "
     "  <INPUT type = 'text' id = 'username'/> "
     "  <INPUT type = 'password' id = 'password'/> "
     "  <INPUT type = 'submit' value = 'LOGIN' />"
     "</FORM>";
 
 const char kAccountCreationFormHTML[] =
     "<FORM name = 'blah' action = 'http://www.random.com/'> "
     "  <INPUT type = 'text' id = 'username'/> "
+    "  <INPUT type = 'password' id = 'first_password' size=5/> "
+    "  <INPUT type = 'password' id = 'second_password' size=5/> "
+    "  <INPUT type = 'submit' value = 'LOGIN' />"
+    "</FORM>";
+
+const char kHiddenPasswordAccountCreationFormHTML[] =
+    "<FORM name = 'blah' action = 'http://www.random.com/'> "
+    "  <INPUT type = 'text' id = 'username'/> "
+    "  <INPUT type = 'password' id = 'first_password'/> "
+    "  <INPUT type = 'password' id = 'second_password' style='display:none'/> "
+    "  <INPUT type = 'submit' value = 'LOGIN' />"
+    "</FORM>";
+
+const char kInvalidActionAccountCreationFormHTML[] =
+    "<FORM name = 'blah' action = 'invalid'> "
+    "  <INPUT type = 'text' id = 'username'/> "
     "  <INPUT type = 'password' id = 'first_password'/> "
     "  <INPUT type = 'password' id = 'second_password'/> "
     "  <INPUT type = 'submit' value = 'LOGIN' />"
     "</FORM>";
 
 TEST_F(PasswordGenerationManagerTest, DetectionTest) {
   LoadHTML(kSigninFormHTML);
 
   WebDocument document = GetMainFrame()->document();
   WebElement element =
       document.getElementById(WebString::fromUTF8("password"));
   ASSERT_FALSE(element.isNull());
   WebInputElement password_element = element.to<WebInputElement>();
   EXPECT_FALSE(DecorationIsVisible(&password_element));
 
   LoadHTML(kAccountCreationFormHTML);
 
   // We don't show the decoration yet because the feature isn't enabled.
   document = GetMainFrame()->document();
   element = document.getElementById(WebString::fromUTF8("first_password"));
   ASSERT_FALSE(element.isNull());
   WebInputElement first_password_element = element.to<WebInputElement>();
-  element = document.getElementById(WebString::fromUTF8("second_password"));
-  ASSERT_FALSE(element.isNull());
-  WebInputElement second_password_element = element.to<WebInputElement>();
   EXPECT_FALSE(DecorationIsVisible(&first_password_element));
 
   // Pretend like password generation was enabled.
   AutofillMsg_PasswordGenerationEnabled msg(0, true);
   generation_manager_->OnMessageReceived(msg);
 
   // Now check that the decoration is visible on the first password field and
   // that we send a message after the decoration is clicked.
   LoadHTML(kAccountCreationFormHTML);
   document = GetMainFrame()->document();
   element = document.getElementById(WebString::fromUTF8("first_password"));
   ASSERT_FALSE(element.isNull());
   first_password_element = element.to<WebInputElement>();
-  element = document.getElementById(WebString::fromUTF8("second_password"));
-  ASSERT_FALSE(element.isNull());
-  second_password_element = element.to<WebInputElement>();
   EXPECT_TRUE(DecorationIsVisible(&first_password_element));
   SimulateClickOnDecoration(&first_password_element);
   EXPECT_EQ(1u, generation_manager_->messages().size());
   EXPECT_EQ(AutofillHostMsg_ShowPasswordGenerationPopup::ID,
             generation_manager_->messages()[0]->type());
+
+  // This doesn't trigger because hidden password fields are ignored.
+  LoadHTML(kHiddenPasswordAccountCreationFormHTML);
+  document = GetMainFrame()->document();
+  element = document.getElementById(WebString::fromUTF8("first_password"));
+  ASSERT_FALSE(element.isNull());
+  first_password_element = element.to<WebInputElement>();
+  EXPECT_FALSE(DecorationIsVisible(&first_password_element));
+
+  // This doesn't trigger because the form action is invalid.
+  LoadHTML(kInvalidActionAccountCreationFormHTML);
+  document = GetMainFrame()->document();
+  element = document.getElementById(WebString::fromUTF8("first_password"));
+  ASSERT_FALSE(element.isNull());
+  first_password_element = element.to<WebInputElement>();
+  EXPECT_FALSE(DecorationIsVisible(&first_password_element));
 }
 
 TEST_F(PasswordGenerationManagerTest, FillTest) {
   // Make sure that we are enabled before loading HTML.
   AutofillMsg_PasswordGenerationEnabled enabled_msg(0, true);
   generation_manager_->OnMessageReceived(enabled_msg);
   LoadHTML(kAccountCreationFormHTML);
 
   WebDocument document = GetMainFrame()->document();
   WebElement element =
@@ skipping 13 matching lines @@
   generation_manager_->OnMessageReceived(msg);
 
   // Password fields are filled out and set as being autofilled.
   EXPECT_EQ(password, first_password_element.value());
   EXPECT_EQ(password, second_password_element.value());
   EXPECT_TRUE(first_password_element.isAutofilled());
   EXPECT_TRUE(second_password_element.isAutofilled());
 }
 
 }  // namespace autofill