2 things:

- relanding the CL that fixes the layout tests
- turning on more of the autofill popup to see if this is causing the perf regression.

TBR=nsylvain
Review URL: http://codereview.chromium.org/9708

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

1 files changed, 5 insertions, 4 deletions

diff --git a/webkit/glue/webframeloaderclient_impl.cc b/webkit/glue/webframeloaderclient_impl.cc
index 06e0645..6c50037 100644
--- a/webkit/glue/webframeloaderclient_impl.cc
+++ b/webkit/glue/webframeloaderclient_impl.cc
@@ -363,9 +363,9 @@ void WebFrameLoaderClient::dispatchDidFinishDocumentLoad() {
         actions.push_back(*data);
         // Let's remember the names of password related fields so we do not
         // autofill them with the regular form autofill.
-        DCHECK(!data->username_element.empty());
+        if (!data->username_element.empty())
+          password_related_fields.insert(data->username_element);
         DCHECK(!data->password_element.empty());
-        password_related_fields.insert(data->username_element);
         password_related_fields.insert(data->password_element);
         if (!data->old_password_element.empty())
           password_related_fields.insert(data->old_password_element);
@@ -374,8 +374,7 @@ void WebFrameLoaderClient::dispatchDidFinishDocumentLoad() {
       // Now let's register for any text input.
       // TODO(jcampan): bug #3847 merge password and form autofill so we
       // traverse the form elements only once.
-      // Disabling the autofill to investigate the perf regression on build bot.
-      // RegisterAutofillListeners(form, password_related_fields);
+      RegisterAutofillListeners(form, password_related_fields);
     }
   }
 
@@ -731,6 +730,7 @@ void WebFrameLoaderClient::RegisterAutofillListeners(
     if (excluded_fields.find(name) != excluded_fields.end())
       continue;
 
+/* Disabling this temporarily to investigate perf regressions
 #if !defined(OS_MACOSX)
     // FIXME on Mac
     webkit_glue::FormAutocompleteListener* listener =
@@ -738,6 +738,7 @@ void WebFrameLoaderClient::RegisterAutofillListeners(
                                                   input_element);
     webkit_glue::AttachForInlineAutocomplete(input_element, listener);
 #endif
+    */
   }
 }