Get rid of FormStructure::ConvertToFormData()

BUG=none
TEST=unit_tests --gtest_filter=FormStructureTest.SourceURL

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

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

4 files changed, 6 insertions, 52 deletions

diff --git a/chrome/browser/autofill/autofill_manager.cc b/chrome/browser/autofill/autofill_manager.cc
index d8e2252..10d2385 100644
--- a/chrome/browser/autofill/autofill_manager.cc
+++ b/chrome/browser/autofill/autofill_manager.cc
@@ -87,7 +87,7 @@ void RemoveDuplicateElements(
 }
 
 bool FormIsHTTPS(FormStructure* form) {
-  return form->ConvertToFormData().origin.SchemeIs(chrome::kHttpsScheme);
+  return form->source_url().SchemeIs(chrome::kHttpsScheme);
 }
 
 }  // namespace
diff --git a/chrome/browser/autofill/form_structure.cc b/chrome/browser/autofill/form_structure.cc
index 2323f1a..6e018a1 100644
--- a/chrome/browser/autofill/form_structure.cc
+++ b/chrome/browser/autofill/form_structure.cc
@@ -327,30 +327,6 @@ size_t FormStructure::field_count() const {
   return (field_size == 0) ? 0 : field_size - 1;
 }
 
-FormData FormStructure::ConvertToFormData() const {
-  FormData form;
-  form.name = form_name_;
-  form.origin = source_url_;
-  form.action = target_url_;
-
-  // FormStructures can't be created by forms not submitted by the user.
-  form.user_submitted = true;
-
-  if (method_ == GET)
-    form.method = ASCIIToUTF16("GET");
-  else if (method_ == POST)
-    form.method = ASCIIToUTF16("POST");
-  else
-    NOTREACHED();
-
-  for (std::vector<AutoFillField*>::const_iterator iter = fields_.begin();
-       iter != fields_.end() && *iter; ++iter) {
-    form.fields.push_back(static_cast<webkit_glue::FormField>(**iter));
-  }
-
-  return form;
-}
-
 bool FormStructure::operator==(const FormData& form) const {
   // TODO(jhawkins): Is this enough to differentiate a form?
   if (form_name_ == form.name &&
diff --git a/chrome/browser/autofill/form_structure.h b/chrome/browser/autofill/form_structure.h
index 875a6bf..bb583dc 100644
--- a/chrome/browser/autofill/form_structure.h
+++ b/chrome/browser/autofill/form_structure.h
@@ -93,9 +93,6 @@ class FormStructure {
   // Returns the number of fields that are able to be autofilled.
   size_t autofill_count() const { return autofill_count_; }
 
-  // Converts this object to a FormData object.
-  webkit_glue::FormData ConvertToFormData() const;
-
   // Used for iterating over the fields.
   std::vector<AutoFillField*>::const_iterator begin() const {
     return fields_.begin();
@@ -104,6 +101,8 @@ class FormStructure {
     return fields_.end();
   }
 
+  const GURL& source_url() const { return source_url_; }
+
   bool operator==(const webkit_glue::FormData& form) const;
   bool operator!=(const webkit_glue::FormData& form) const;
 
diff --git a/chrome/browser/autofill/form_structure_unittest.cc b/chrome/browser/autofill/form_structure_unittest.cc
index 14fe516..0eea0a6 100644
--- a/chrome/browser/autofill/form_structure_unittest.cc
+++ b/chrome/browser/autofill/form_structure_unittest.cc
@@ -90,34 +90,13 @@ TEST(FormStructureTest, AutoFillCount) {
   EXPECT_EQ(1U, form_structure.autofill_count());
 }
 
-TEST(FormStructureTest, ConvertToFormData) {
+TEST(FormStructureTest, SourceURL) {
   FormData form;
+  form.origin = GURL("http://www.foo.com/");
   form.method = ASCIIToUTF16("post");
-  form.user_submitted = true;
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("username"),
-                                               ASCIIToUTF16("username"),
-                                               string16(),
-                                               ASCIIToUTF16("text"),
-                                               0));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("password"),
-                                               ASCIIToUTF16("password"),
-                                               string16(),
-                                               ASCIIToUTF16("password"),
-                                               0));
-  form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("state"),
-                                               ASCIIToUTF16("state"),
-                                               string16(),
-                                               ASCIIToUTF16("select"),
-                                               0));
-  form.fields.push_back(webkit_glue::FormField(string16(),
-                                               ASCIIToUTF16("Submit"),
-                                               string16(),
-                                               ASCIIToUTF16("submit"),
-                                               0));
   FormStructure form_structure(form);
 
-  FormData converted = form_structure.ConvertToFormData();
-  EXPECT_EQ(form, converted);
+  EXPECT_EQ(form.origin, form_structure.source_url());
 }
 
 TEST(FormStructureTest, HasAutoFillableValues) {