[Autofill] Clean up unused "experiment_id" support in Autofill

We have a different way of running server experiments now.

BUG=None

Review URL: https://codereview.chromium.org/1414753003

Cr-Commit-Position: refs/heads/master@{#355322}

6 files changed, 7 insertions, 17 deletions

diff --git a/components/autofill/content/common/autofill_messages.h b/components/autofill/content/common/autofill_messages.h
index 821566f..ed6e6d4 100644
--- a/components/autofill/content/common/autofill_messages.h
+++ b/components/autofill/content/common/autofill_messages.h
@@ -76,7 +76,6 @@ IPC_STRUCT_TRAITS_END()
 IPC_STRUCT_TRAITS_BEGIN(autofill::FormDataPredictions)
   IPC_STRUCT_TRAITS_MEMBER(data)
   IPC_STRUCT_TRAITS_MEMBER(signature)
-  IPC_STRUCT_TRAITS_MEMBER(experiment_id)
   IPC_STRUCT_TRAITS_MEMBER(fields)
 IPC_STRUCT_TRAITS_END()
 
diff --git a/components/autofill/content/renderer/form_cache.cc b/components/autofill/content/renderer/form_cache.cc
index d513342..81ddf83 100644
--- a/components/autofill/content/renderer/form_cache.cc
+++ b/components/autofill/content/renderer/form_cache.cc
@@ -292,15 +292,13 @@ bool FormCache::ShowPredictions(const FormDataPredictions& form) {
       continue;
     }
 
-    std::vector<base::string16> replacements;
-    replacements.push_back(base::UTF8ToUTF16(form.fields[i].overall_type));
-    replacements.push_back(base::UTF8ToUTF16(form.fields[i].server_type));
-    replacements.push_back(base::UTF8ToUTF16(form.fields[i].heuristic_type));
-    replacements.push_back(base::UTF8ToUTF16(form.fields[i].signature));
-    replacements.push_back(base::UTF8ToUTF16(form.signature));
-    replacements.push_back(base::UTF8ToUTF16(form.experiment_id));
     base::string16 title = l10n_util::GetStringFUTF16(
-        IDS_AUTOFILL_SHOW_PREDICTIONS_TITLE, replacements, NULL);
+        IDS_AUTOFILL_SHOW_PREDICTIONS_TITLE,
+        base::UTF8ToUTF16(form.fields[i].overall_type),
+        base::UTF8ToUTF16(form.fields[i].server_type),
+        base::UTF8ToUTF16(form.fields[i].heuristic_type),
+        base::UTF8ToUTF16(form.fields[i].signature),
+        base::UTF8ToUTF16(form.signature));
     element.setAttribute("title", WebString(title));
   }
 
diff --git a/components/autofill/core/browser/autofill_manager.h b/components/autofill/core/browser/autofill_manager.h
index c31ccd5..c7062c3 100644
--- a/components/autofill/core/browser/autofill_manager.h
+++ b/components/autofill/core/browser/autofill_manager.h
@@ -485,8 +485,6 @@ class AutofillManager : public AutofillDownloadManager::Observer,
   FRIEND_TEST_ALL_PREFIXES(AutofillMetricsTest,
                            NoQualityMetricsForNonAutofillableForms);
   FRIEND_TEST_ALL_PREFIXES(AutofillMetricsTest, QualityMetrics);
-  FRIEND_TEST_ALL_PREFIXES(AutofillMetricsTest, QualityMetricsForFailure);
-  FRIEND_TEST_ALL_PREFIXES(AutofillMetricsTest, QualityMetricsWithExperimentId);
   FRIEND_TEST_ALL_PREFIXES(AutofillMetricsTest, SaneMetricsWithCacheMismatch);
   FRIEND_TEST_ALL_PREFIXES(AutofillManagerTest, TestExternalDelegate);
   FRIEND_TEST_ALL_PREFIXES(AutofillManagerTest,
diff --git a/components/autofill/core/browser/autofill_xml_parser.h b/components/autofill/core/browser/autofill_xml_parser.h
index d071a5c..1f4e102 100644
--- a/components/autofill/core/browser/autofill_xml_parser.h
+++ b/components/autofill/core/browser/autofill_xml_parser.h
@@ -57,7 +57,7 @@ class AutofillXmlParser : public buzz::XmlParseHandler {
 // The XML parse handler for parsing Autofill query responses.  A typical
 // response looks like:
 //
-// <autofillqueryresponse experimentid="1">
+// <autofillqueryresponse>
 //   <field autofilltype="0" />
 //   <field autofilltype="1" />
 //   <field autofilltype="3" />
@@ -68,7 +68,6 @@ class AutofillXmlParser : public buzz::XmlParseHandler {
 // autofilltype: The server's guess at what type of field this is.  0
 // is unknown, other types are documented in
 // components/autofill/core/browser/field_types.h.
-// Experiment ids are currently ignored.
 class AutofillQueryXmlParser : public AutofillXmlParser {
  public:
   AutofillQueryXmlParser(std::vector<AutofillServerFieldInfo>* field_infos,
diff --git a/components/autofill/core/common/form_data_predictions.cc b/components/autofill/core/common/form_data_predictions.cc
index bf8f755..9c71a97 100644
--- a/components/autofill/core/common/form_data_predictions.cc
+++ b/components/autofill/core/common/form_data_predictions.cc
@@ -12,7 +12,6 @@ FormDataPredictions::FormDataPredictions() {
 FormDataPredictions::FormDataPredictions(const FormDataPredictions& other)
     : data(other.data),
       signature(other.signature),
-      experiment_id(other.experiment_id),
       fields(other.fields) {
 }
 
@@ -23,7 +22,6 @@ bool FormDataPredictions::operator==(
     const FormDataPredictions& predictions) const {
   return (data.SameFormAs(predictions.data) &&
           signature == predictions.signature &&
-          experiment_id == predictions.experiment_id &&
           fields == predictions.fields);
 }
 
diff --git a/components/autofill/core/common/form_data_predictions.h b/components/autofill/core/common/form_data_predictions.h
index 80b04be..164778a5 100644
--- a/components/autofill/core/common/form_data_predictions.h
+++ b/components/autofill/core/common/form_data_predictions.h
@@ -19,8 +19,6 @@ struct FormDataPredictions {
   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<FormFieldDataPredictions> fields;