Use upstream libaddressinput in Chrome.

third_party/libaddressinput/chromium/fallback_data_store.h

Index: third_party/libaddressinput/chromium/fallback_data_store.h
diff --git a/third_party/libaddressinput/chromium/cpp/src/fallback_data_store.h b/third_party/libaddressinput/chromium/fallback_data_store.h
similarity index 62%
rename from third_party/libaddressinput/chromium/cpp/src/fallback_data_store.h
rename to third_party/libaddressinput/chromium/fallback_data_store.h
index ba2417effb9a0adec9892f8e4fd5237e9e0f4ec8..8928d0a5b6794917db84947a4e442bd4e7b127ea 100644
--- a/third_party/libaddressinput/chromium/cpp/src/fallback_data_store.h
+++ b/third_party/libaddressinput/chromium/fallback_data_store.h
@@ -12,22 +12,21 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef I18N_ADDRESSINPUT_FALLBACK_DATA_STORE_H_
-#define I18N_ADDRESSINPUT_FALLBACK_DATA_STORE_H_
+#ifndef THIRD_PARTY_LIBADDRESSINPUT_CHROMIUM_FALLBACK_DATA_STORE_H_
+#define THIRD_PARTY_LIBADDRESSINPUT_CHROMIUM_FALLBACK_DATA_STORE_H_
 
 #include <string>
 
-namespace i18n {
-namespace addressinput {
+namespace autofill {
 
 class FallbackDataStore {
  public:
-  // Gets default data for |key|. Should only be used as a last resort after
-  // attempts to check the local cache or the webserver have failed.
+  // Gets stale, but valid static data for |key|. Should only be used as a last
+  // resort after attempts to check the local cache or the webserver have
+  // failed.
   static bool Get(const std::string& key, std::string* data);
 };
 
-}  // namespace addressinput
-}  // namespace i18n
+}  // namespace autofill
 
-#endif  // I18N_ADDRESSINPUT_FALLBACK_DATA_STORE_H_
+#endif  // THIRD_PARTY_LIBADDRESSINPUT_CHROMIUM_FALLBACK_DATA_STORE_H_