Move forms/ out of webkit/.

chrome/browser/password_manager/password_form_data.cc

 // Copyright (c) 2011 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/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/password_manager/password_form_data.h"
 
-using webkit::forms::PasswordForm;
+using content::PasswordForm;
 
 PasswordForm* CreatePasswordFormFromData(
     const PasswordFormData& form_data) {
   PasswordForm* form = new PasswordForm();
   form->scheme = form_data.scheme;
   form->preferred = form_data.preferred;
   form->ssl_valid = form_data.ssl_valid;
   form->date_created = base::Time::FromDoubleT(form_data.creation_time);
   if (form_data.signon_realm)
     form->signon_realm = std::string(form_data.signon_realm);
@@ skipping 42 matching lines @@
             << "username_elem: " << form.username_element << std::endl
             << "password_elem: " << form.password_element << std::endl
             << "username_value: " << form.username_value << std::endl
             << "password_value: " << form.password_value << std::endl
             << "blacklisted: " << form.blacklisted_by_user << std::endl
             << "preferred: " << form.preferred << std::endl
             << "ssl_valid: " << form.ssl_valid << std::endl
             << "date_created: " << form.date_created.ToDoubleT();
 }
 
-typedef std::set<const webkit::forms::PasswordForm*> SetOfForms;
+typedef std::set<const content::PasswordForm*> SetOfForms;
 
 bool ContainsSamePasswordFormsPtr(
     const std::vector<PasswordForm*>& first,
     const std::vector<PasswordForm*>& second) {
   if (first.size() != second.size())
     return false;
 
   // TODO(cramya): As per b/7079906, the STLport of Android causes a crash
   // if we use expectations(first.begin(), first.end()) to copy a vector
   // into a set rather than std::copy that is used below.
@@ skipping 15 matching lines @@
     }
     if (!found_match) {
       LOG(ERROR) << "No match for:" << std::endl << *actual;
       return false;
     }
   }
   return true;
 }
 
 bool ContainsSamePasswordForms(
-    std::vector<webkit::forms::PasswordForm>& first,
-    std::vector<webkit::forms::PasswordForm>& second) {
+    std::vector<content::PasswordForm>& first,
+    std::vector<content::PasswordForm>& second) {
   std::vector<PasswordForm*> first_ptr;
   for (unsigned int i = 0; i < first.size(); ++i) {
     first_ptr.push_back(&first[i]);
   }
   std::vector<PasswordForm*> second_ptr;
   for (unsigned int i = 0; i < second.size(); ++i) {
     second_ptr.push_back(&second[i]);
   }
   return ContainsSamePasswordFormsPtr(first_ptr, second_ptr);
 }