Revert 89716 - Add a debugging flag to annotate web forms with their Autofill field type predictions.

BUG=none
TEST=none

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

TBR=isherman@chromium.org
Review URL: http://codereview.chromium.org/7204037

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

9 files changed, 5 insertions, 120 deletions

diff --git a/webkit/glue/form_data.cc b/webkit/glue/form_data.cc
index 07b0613..4e1a6ea 100644
--- a/webkit/glue/form_data.cc
+++ b/webkit/glue/form_data.cc
@@ -1,11 +1,9 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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 "webkit/glue/form_data.h"
 
-#include "base/string_util.h"
-
 namespace webkit_glue {
 
 FormData::FormData()
diff --git a/webkit/glue/form_data.h b/webkit/glue/form_data.h
index 288e734..f0011c7 100644
--- a/webkit/glue/form_data.h
+++ b/webkit/glue/form_data.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
@@ -7,7 +7,7 @@
 
 #include <vector>
 
-#include "base/string16.h"
+#include "base/string_util.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/glue/form_field.h"
 
diff --git a/webkit/glue/form_data_predictions.cc b/webkit/glue/form_data_predictions.cc
deleted file mode 100644
index e3ddf70..0000000
--- a/webkit/glue/form_data_predictions.cc
+++ /dev/null
@@ -1,22 +0,0 @@
-// 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 "webkit/glue/form_data_predictions.h"
-
-namespace webkit_glue {
-
-FormDataPredictions::FormDataPredictions() {
-}
-
-FormDataPredictions::FormDataPredictions(const FormDataPredictions& other)
-    : data(other.data),
-      signature(other.signature),
-      experiment_id(other.experiment_id),
-      fields(other.fields) {
-}
-
-FormDataPredictions::~FormDataPredictions() {
-}
-
-}  // namespace webkit_glue
diff --git a/webkit/glue/form_data_predictions.h b/webkit/glue/form_data_predictions.h
deleted file mode 100644
index 7661ff9..0000000
--- a/webkit/glue/form_data_predictions.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// 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.
-
-#ifndef WEBKIT_GLUE_FORM_DATA_PREDICTIONS_H__
-#define WEBKIT_GLUE_FORM_DATA_PREDICTIONS_H__
-
-#include <string>
-#include <vector>
-
-#include "webkit/glue/form_data.h"
-#include "webkit/glue/form_field_predictions.h"
-
-namespace webkit_glue {
-
-// Holds information about a form to be filled and/or submitted.
-struct FormDataPredictions {
-  // Data for this form.
-  FormData data;
-  // The form signature for communication with the crowdsourcing server.
-  std::string signature;
-  // The experiment id for the server predictions.
-  std::string experiment_id;
-  // The form fields and their predicted field types.
-  std::vector<FormFieldPredictions> fields;
-
-  FormDataPredictions();
-  FormDataPredictions(const FormDataPredictions& other);
-  ~FormDataPredictions();
-};
-
-}  // namespace webkit_glue
-
-#endif  // WEBKIT_GLUE_FORM_DATA_PREDICTIONS_H__
diff --git a/webkit/glue/form_field.cc b/webkit/glue/form_field.cc
index 1f62044..0de8446 100644
--- a/webkit/glue/form_field.cc
+++ b/webkit/glue/form_field.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
diff --git a/webkit/glue/form_field.h b/webkit/glue/form_field.h
index c0f25f9..c246091 100644
--- a/webkit/glue/form_field.h
+++ b/webkit/glue/form_field.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
diff --git a/webkit/glue/form_field_predictions.cc b/webkit/glue/form_field_predictions.cc
deleted file mode 100644
index 11383bd..0000000
--- a/webkit/glue/form_field_predictions.cc
+++ /dev/null
@@ -1,23 +0,0 @@
-// 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 "webkit/glue/form_field_predictions.h"
-
-namespace webkit_glue {
-
-FormFieldPredictions::FormFieldPredictions() {
-}
-
-FormFieldPredictions::FormFieldPredictions(const FormFieldPredictions& other)
-    : field(other.field),
-      signature(other.signature),
-      heuristic_type(other.heuristic_type),
-      server_type(other.server_type),
-      overall_type(other.overall_type) {
-}
-
-FormFieldPredictions::~FormFieldPredictions() {
-}
-
-}  // namespace webkit_glue
diff --git a/webkit/glue/form_field_predictions.h b/webkit/glue/form_field_predictions.h
deleted file mode 100644
index baa8b3f..0000000
--- a/webkit/glue/form_field_predictions.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// 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.
-
-#ifndef WEBKIT_GLUE_FORM_FIELD_PREDICTIONS_H_
-#define WEBKIT_GLUE_FORM_FIELD_PREDICTIONS_H_
-
-#include <string>
-#include <vector>
-
-#include "webkit/glue/form_field.h"
-
-namespace webkit_glue {
-
-// Stores information about a field in a form.
-struct FormFieldPredictions {
-  FormFieldPredictions();
-  FormFieldPredictions(const FormFieldPredictions& other);
-  ~FormFieldPredictions();
-
-  FormField field;
-  std::string signature;
-  std::string heuristic_type;
-  std::string server_type;
-  std::string overall_type;
-};
-
-}  // namespace webkit_glue
-
-#endif  // WEBKIT_GLUE_FORM_FIELD_PREDICTIONS_H_
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index 33a9646..cf2b7f4 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -343,12 +343,8 @@
         'dom_operations.h',
         'form_data.cc',
         'form_data.h',
-        'form_data_predictions.cc',
-        'form_data_predictions.h',
         'form_field.cc',
         'form_field.h',
-        'form_field_predictions.cc',
-        'form_field_predictions.h',
         'ftp_directory_listing_response_delegate.cc',
         'ftp_directory_listing_response_delegate.h',
         'gl_bindings_skia_cmd_buffer.cc',