Move remaining Autofill code to //components/autofill.

chrome/browser/autofill/address.cc

Index: chrome/browser/autofill/address.cc
diff --git a/chrome/browser/autofill/address.cc b/chrome/browser/autofill/address.cc
deleted file mode 100644
index c1ed7acfcb776422a41690f5733f94377de0f71c..0000000000000000000000000000000000000000
--- a/chrome/browser/autofill/address.cc
+++ /dev/null
@@ -1,114 +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 "chrome/browser/autofill/address.h"
-
-#include <stddef.h>
-
-#include "base/basictypes.h"
-#include "base/logging.h"
-#include "base/string_util.h"
-#include "chrome/browser/autofill/autofill_country.h"
-#include "chrome/browser/autofill/autofill_type.h"
-#include "chrome/browser/autofill/field_types.h"
-
-namespace {
-
-const char16 kAddressSplitChars[] = {'-', ',', '#', '.', ' ', 0};
-
-}  // namespace
-
-Address::Address() {}
-
-Address::Address(const Address& address) : FormGroup() {
-  *this = address;
-}
-
-Address::~Address() {}
-
-Address& Address::operator=(const Address& address) {
-  if (this == &address)
-    return *this;
-
-  line1_ = address.line1_;
-  line2_ = address.line2_;
-  city_ = address.city_;
-  state_ = address.state_;
-  country_code_ = address.country_code_;
-  zip_code_ = address.zip_code_;
-  return *this;
-}
-
-void Address::GetSupportedTypes(FieldTypeSet* supported_types) const {
-  supported_types->insert(ADDRESS_HOME_LINE1);
-  supported_types->insert(ADDRESS_HOME_LINE2);
-  supported_types->insert(ADDRESS_HOME_CITY);
-  supported_types->insert(ADDRESS_HOME_STATE);
-  supported_types->insert(ADDRESS_HOME_ZIP);
-  supported_types->insert(ADDRESS_HOME_COUNTRY);
-}
-
-string16 Address::GetRawInfo(AutofillFieldType type) const {
-  if (type == ADDRESS_HOME_LINE1)
-    return line1_;
-
-  if (type == ADDRESS_HOME_LINE2)
-    return line2_;
-
-  if (type == ADDRESS_HOME_CITY)
-    return city_;
-
-  if (type == ADDRESS_HOME_STATE)
-    return state_;
-
-  if (type ==  ADDRESS_HOME_ZIP)
-    return zip_code_;
-
-  if (type == ADDRESS_HOME_COUNTRY)
-    return Country();
-
-  return string16();
-}
-
-void Address::SetRawInfo(AutofillFieldType type, const string16& value) {
-  type = AutofillType::GetEquivalentFieldType(type);
-  if (type == ADDRESS_HOME_LINE1)
-    line1_ = value;
-  else if (type == ADDRESS_HOME_LINE2)
-    line2_ = value;
-  else if (type == ADDRESS_HOME_CITY)
-    city_ = value;
-  else if (type == ADDRESS_HOME_STATE)
-    state_ = value;
-  else if (type == ADDRESS_HOME_COUNTRY)
-    // TODO(isherman): When setting the country, it should only be possible to
-    // call this with a country code, which means we should be able to drop the
-    // call to GetCountryCode() below.
-    country_code_ =
-        AutofillCountry::GetCountryCode(value,
-                                        AutofillCountry::ApplicationLocale());
-  else if (type == ADDRESS_HOME_ZIP)
-    zip_code_ = value;
-  else
-    NOTREACHED();
-}
-
-void Address::GetMatchingTypes(const string16& text,
-                               const std::string& app_locale,
-                               FieldTypeSet* matching_types) const {
-  FormGroup::GetMatchingTypes(text, app_locale, matching_types);
-
-  // Check to see if the |text| canonicalized as a country name is a match.
-  std::string country_code = AutofillCountry::GetCountryCode(text, app_locale);
-  if (!country_code.empty() && country_code_ == country_code)
-    matching_types->insert(ADDRESS_HOME_COUNTRY);
-}
-
-string16 Address::Country() const {
-  if (country_code().empty())
-    return string16();
-
-  std::string app_locale = AutofillCountry::ApplicationLocale();
-  return AutofillCountry(country_code(), app_locale).name();
-}