Revert 38479 - Send forms seen in the renderer to the AutoFillManager.

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/584009

TBR=jhawkins@chromium.org
Review URL: http://codereview.chromium.org/597045

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

2 files changed, 3 insertions, 18 deletions

diff --git a/chrome/browser/autofill/autofill_manager.cc b/chrome/browser/autofill/autofill_manager.cc
index bf0857d..23f9574 100644
--- a/chrome/browser/autofill/autofill_manager.cc
+++ b/chrome/browser/autofill/autofill_manager.cc
@@ -61,18 +61,6 @@ void AutoFillManager::FormFieldValuesSubmitted(
   }
 }
 
-void AutoFillManager::FormsSeen(
-    const std::vector<webkit_glue::FormFieldValues>& forms) {
-  form_structures_.reset();
-  for (std::vector<webkit_glue::FormFieldValues>::const_iterator iter =
-           forms.begin();
-       iter != forms.end(); ++iter) {
-    FormStructure* form_structure = new FormStructure(*iter);
-    DeterminePossibleFieldTypes(form_structure);
-    form_structures_.push_back(form_structure);
-  }
-}
-
 void AutoFillManager::OnAutoFillDialogApply(
     std::vector<AutoFillProfile>* profiles,
     std::vector<CreditCard>* credit_cards) {
@@ -114,7 +102,7 @@ void AutoFillManager::HandleSubmit() {
   // If there wasn't enough data to import then we don't want to send an upload
   // to the server.
   if (personal_data_ &&
-      !personal_data_->ImportFormData(form_structures_.get(), this))
+      !personal_data_->ImportFormData(form_structures_, this))
     return;
 
   UploadFormData();
diff --git a/chrome/browser/autofill/autofill_manager.h b/chrome/browser/autofill/autofill_manager.h
index 0c55853..85905c8 100644
--- a/chrome/browser/autofill/autofill_manager.h
+++ b/chrome/browser/autofill/autofill_manager.h
@@ -8,7 +8,6 @@
 #include <vector>
 
 #include "base/scoped_ptr.h"
-#include "base/scoped_vector.h"
 #include "chrome/browser/autofill/autofill_dialog.h"
 #include "chrome/browser/autofill/personal_data_manager.h"
 #include "chrome/browser/renderer_host/render_view_host_delegate.h"
@@ -39,8 +38,6 @@ class AutoFillManager : public RenderViewHostDelegate::AutoFill,
   // RenderViewHostDelegate::AutoFill implementation:
   virtual void FormFieldValuesSubmitted(
       const webkit_glue::FormFieldValues& form);
-  virtual void FormsSeen(
-      const std::vector<webkit_glue::FormFieldValues>& forms);
 
   // AutoFillDialogObserver implementation:
   virtual void OnAutoFillDialogApply(
@@ -74,11 +71,11 @@ class AutoFillManager : public RenderViewHostDelegate::AutoFill,
   TabContents* tab_contents_;
 
   // The personal data manager, used to save and load personal data to/from the
-  // web database.  This may be NULL if we're OTR.
+  // web database.
   PersonalDataManager* personal_data_;
 
   // Our copy of the form data.
-  ScopedVector<FormStructure> form_structures_;
+  std::vector<FormStructure*> form_structures_;
   scoped_ptr<FormStructure> upload_form_structure_;
 
   // The infobar that asks for permission to store form information.