Move forms/ out of webkit/.

chrome/browser/autofill/autofill_metrics.cc

 // Copyright (c) 2012 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 "chrome/browser/autofill/autofill_metrics.h"
 
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/time.h"
 #include "chrome/browser/autofill/autofill_type.h"
 #include "chrome/browser/autofill/form_structure.h"
-#include "webkit/forms/form_data.h"
+#include "chrome/common/form_data.h"
 
 namespace {
 
 // Server experiments we support.
 enum ServerExperiment {
   NO_EXPERIMENT = 0,
   UNKNOWN_EXPERIMENT,
   ACCEPTANCE_RATIO_06,
   ACCEPTANCE_RATIO_1,
   ACCEPTANCE_RATIO_2,
@@ skipping 173 matching lines @@
   LogUMAHistogramEnumeration(sub_histogram_name,
                              field_type_group_metric,
                              num_field_type_group_metrics);
 }
 
 void LogServerExperimentId(const std::string& histogram_name,
                            const std::string& experiment_id) {
   ServerExperiment metric = UNKNOWN_EXPERIMENT;
 
   const std::string default_experiment_name =
-      FormStructure(webkit::forms::FormData()).server_experiment_id();
+      FormStructure(FormData()).server_experiment_id();
   if (experiment_id.empty())
     metric = NO_EXPERIMENT;
   else if (experiment_id == "ar06")
     metric = ACCEPTANCE_RATIO_06;
   else if (experiment_id == "ar1")
     metric = ACCEPTANCE_RATIO_1;
   else if (experiment_id == "ar2")
     metric = ACCEPTANCE_RATIO_2;
   else if (experiment_id == "ar4")
     metric = ACCEPTANCE_RATIO_4;
@@ skipping 149 matching lines @@
 
 void AutofillMetrics::LogServerExperimentIdForQuery(
     const std::string& experiment_id) const {
   LogServerExperimentId("Autofill.ServerExperimentId.Query", experiment_id);
 }
 
 void AutofillMetrics::LogServerExperimentIdForUpload(
     const std::string& experiment_id) const {
   LogServerExperimentId("Autofill.ServerExperimentId.Upload", experiment_id);
 }