Move forms/ out of webkit/.

chrome/renderer/autofill/password_generation_manager.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 "chrome/renderer/autofill/password_generation_manager.h"
 
 #include "base/logging.h"
 #include "chrome/common/autofill_messages.h"
 #include "chrome/common/password_generation_util.h"
+#include "content/public/renderer/password_form_conversion_utils.h"
 #include "content/public/renderer/render_view.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFormElement.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
@@ skipping 83 matching lines @@
   frame->document().forms(forms);
   for (size_t i = 0; i < forms.size(); ++i) {
     // Ignore forms with autocomplete turned off for now. We may remove this in
     // the future, as we only want to avoid creating passwords if the signin
     // form has autocomplete turned off.
     if (forms[i].isNull() || !forms[i].autoComplete())
       continue;
 
     // If we can't get a valid PasswordForm, we skip this form because the
     // the password won't get saved even if we generate it.
-    scoped_ptr<webkit::forms::PasswordForm> password_form(
-        webkit::forms::PasswordFormDomManager::CreatePasswordForm(forms[i]));
+    scoped_ptr<content::PasswordForm> password_form(
+        content::CreatePasswordForm(forms[i]));
     if (!password_form.get()) {
       DVLOG(2) << "Skipping form as it would not be saved";
       continue;
     }
 
     // Do not generate password for GAIA since it is used to retrieve the
     // generated paswords.
     GURL realm(password_form->signon_realm);
     if (realm == GURL(GaiaUrls::GetInstance()->gaia_login_form_realm()))
       continue;
@@ skipping 43 matching lines @@
 WebKit::WebCString PasswordGenerationManager::imageNameForDisabledState() {
   return imageNameForNormalState();
 }
 
 WebKit::WebCString PasswordGenerationManager::imageNameForReadOnlyState() {
   return imageNameForNormalState();
 }
 
 void PasswordGenerationManager::handleClick(WebKit::WebInputElement& element) {
   gfx::Rect rect(element.decorationElementFor(this).boundsInViewportSpace());
-  scoped_ptr<webkit::forms::PasswordForm> password_form(
-      webkit::forms::PasswordFormDomManager::CreatePasswordForm(
-          element.form()));
+  scoped_ptr<content::PasswordForm> password_form(
+      content::CreatePasswordForm(element.form()));
   // We should not have shown the icon we can't create a valid PasswordForm.
   DCHECK(password_form.get());
 
   Send(new AutofillHostMsg_ShowPasswordGenerationPopup(routing_id(),
                                                        rect,
                                                        element.maxLength(),
                                                        *password_form));
   password_generation::LogPasswordGenerationEvent(
       password_generation::BUBBLE_SHOWN);
 }
@@ skipping 11 matching lines @@
     IPC_MESSAGE_HANDLER(AutofillMsg_GeneratedPasswordAccepted,
                         OnPasswordAccepted)
     IPC_MESSAGE_HANDLER(AutofillMsg_PasswordGenerationEnabled,
                         OnPasswordGenerationEnabled)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void PasswordGenerationManager::OnFormNotBlacklisted(
-    const webkit::forms::PasswordForm& form) {
+    const content::PasswordForm& form) {
   not_blacklisted_password_form_origins_.push_back(form.origin);
   MaybeShowIcon();
 }
 
 void PasswordGenerationManager::OnPasswordAccepted(const string16& password) {
   for (std::vector<WebKit::WebInputElement>::iterator it = passwords_.begin();
        it != passwords_.end(); ++it) {
     it->setValue(password);
     it->setAutofilled(true);
     // Advance focus to the next input field. We assume password fields in
@@ skipping 23 matching lines @@
       passwords_[0].decorationElementFor(this).setAttribute("style",
                                                             "display:block");
       password_generation::LogPasswordGenerationEvent(
           password_generation::ICON_SHOWN);
       return;
     }
   }
 }
 
 }  // namespace autofill