Use upstream libaddressinput in Chrome.

third_party/libaddressinput/chromium/trie_unittest.cc

Index: third_party/libaddressinput/chromium/trie_unittest.cc
diff --git a/third_party/libaddressinput/chromium/cpp/test/util/trie_test.cc b/third_party/libaddressinput/chromium/trie_unittest.cc
similarity index 76%
rename from third_party/libaddressinput/chromium/cpp/test/util/trie_test.cc
rename to third_party/libaddressinput/chromium/trie_unittest.cc
index 0baa0b4fb8c4a50c34861a2e3b187c9e67ecde17..193cec612b65172c0bdb06a379b02a6637a4946e 100644
--- a/third_party/libaddressinput/chromium/cpp/test/util/trie_test.cc
+++ b/third_party/libaddressinput/chromium/trie_unittest.cc
@@ -1,28 +1,15 @@
-// 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 "util/trie.h"
+#include "third_party/libaddressinput/chromium/trie.h"
 
 #include <set>
 #include <string>
 
-#include <gtest/gtest.h>
+#include "testing/gtest/include/gtest/gtest.h"
 
-namespace i18n {
-namespace addressinput {
-
-namespace {
+namespace autofill {
 
 TEST(TrieTest, EmptyTrieHasNoData) {
   Trie<std::string> trie;
@@ -108,7 +95,4 @@ TEST(TrieTest, CanFindVeryLongKey) {
   EXPECT_EQ(expected, result);
 }
 
-}  // namespace
-
-}  // namespace addressinput
-}  // namespace i18n
+}  // namespace autofill