Componentize autofill dialog common code

components/autofill/core/browser/server_field_types_util.h

Index: components/autofill/core/browser/server_field_types_util.h
diff --git a/chrome/browser/ui/autofill/autofill_dialog_common.h b/components/autofill/core/browser/server_field_types_util.h
similarity index 56%
copy from chrome/browser/ui/autofill/autofill_dialog_common.h
copy to components/autofill/core/browser/server_field_types_util.h
index 626d676b01e38a791e3c19fdf391cacb3837fb4a..4f62f514f7c2712e73bbf8ca9c3eb15ba608a653 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_common.h
+++ b/components/autofill/core/browser/server_field_types_util.h
@@ -1,31 +1,20 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 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 CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_DIALOG_COMMON_H_
-#define CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_DIALOG_COMMON_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_SERVER_FIELD_TYPES_UTIL_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_SERVER_FIELD_TYPES_UTIL_H_
 
-#include "chrome/browser/ui/autofill/autofill_dialog_types.h"
-#include "components/autofill/core/browser/autofill_metrics.h"
-#include "components/autofill/core/browser/autofill_type.h"
-#include "components/autofill/core/browser/field_types.h"
-
-namespace autofill {
-class AutofillProfile;
-}
+#include <vector>
 
-namespace wallet {
-class Address;
-}
+#include "components/autofill/core/browser/detail_input.h"
+#include "components/autofill/core/browser/dialog_section.h"
+#include "components/autofill/core/browser/field_types.h"
 
 namespace autofill {
-namespace common {
 
-// The types of addresses this class supports building.
-enum AddressType {
-  ADDRESS_TYPE_BILLING,
-  ADDRESS_TYPE_SHIPPING,
-};
+class AutofillField;
+class AutofillType;
 
 // Returns true if |type| should be shown when |field_type| has been requested.
 // This filters the types that we fill into the page to match the ones the
@@ -49,20 +38,9 @@ void BuildInputs(const DetailInput input_template[],
                  size_t template_size,
                  DetailInputs* inputs);
 
-// Returns the AutofillMetrics::DIALOG_UI_*_ITEM_ADDED metric corresponding
-// to the |section|.
-AutofillMetrics::DialogUiEvent DialogSectionToUiItemAddedEvent(
-    DialogSection section);
-
-// Returns the AutofillMetrics::DIALOG_UI_*_ITEM_ADDED metric corresponding
-// to the |section|.
-AutofillMetrics::DialogUiEvent DialogSectionToUiSelectionChangedEvent(
-    DialogSection section);
-
 // Gets just the |type| attributes from each DetailInput.
 std::vector<ServerFieldType> TypesFromInputs(const DetailInputs& inputs);
 
-}  // namespace common
 }  // namespace autofill
 
-#endif  // CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_DIALOG_COMMON_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_SERVER_FIELD_TYPES_UTIL_H_