Reland "Use upstream libaddressinput in Chrome."

third_party/libaddressinput/chromium/fallback_data_store.cc

Index: third_party/libaddressinput/chromium/fallback_data_store.cc
diff --git a/third_party/libaddressinput/chromium/cpp/src/fallback_data_store.cc b/third_party/libaddressinput/chromium/fallback_data_store.cc
similarity index 95%
copy from third_party/libaddressinput/chromium/cpp/src/fallback_data_store.cc
copy to third_party/libaddressinput/chromium/fallback_data_store.cc
index a87d8ea06da697c8d0848400deb37c8237c0e89d..4c20aa10d2733370f5f4a029a6704deb767a29ed 100644
--- a/third_party/libaddressinput/chromium/cpp/src/fallback_data_store.cc
+++ b/third_party/libaddressinput/chromium/fallback_data_store.cc
@@ -1,30 +1,22 @@
-// Copyright (C) 2014 Google Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// 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.
 
 #include "fallback_data_store.h"
 
 #include <string>
 
-namespace i18n {
-namespace addressinput {
+namespace autofill {
 
 bool FallbackDataStore::Get(const std::string& key, std::string* data) {
   if (key != "data/US")
     return false;
 
-  // Available at https://i18napis.appspot.com/ssl-aggregate-address/data/US
+  // Available at https://i18napis.appspot.com/ssl-aggregate-address/data/US.
+  // The appended checksum is valid, but the timestamp is old.
   data->assign(
+      "timestamp=0\n"
+      "checksum=38d4bcdadfe494ffe062a7ad668d66d6\n"
       "{\"data/US/LA\": {\"lang\": \"en\", \"zipex\": \"70000,71599\", \"nam"
       "e\": \"Louisiana\", \"zip\": \"70|71[0-5]\", \"key\": \"LA\", \"id\":"
       " \"data/US/LA\"}, \"data/US/VT\": {\"lang\": \"en\", \"zipex\": \"0500"
@@ -208,5 +200,4 @@ bool FallbackDataStore::Get(const std::string& key, std::string* data) {
   return true;
 }
 
-}  // namespace addressinput
-}  // namespace i18n
+}  // namespace autofill