Revert of Determine language code and type of format for address.

third_party/libaddressinput/chromium/cpp/test/address_data_test.cc

 // 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,
@@ skipping 67 matching lines @@
                   address.address_lines.end());
   expected.push_back(address.postal_code + " " + address.locality);
   expected.push_back(address.administrative_area);
 
   EXPECT_EQ(expected, actual);
 }
 
 TEST(AddressDataTest, FormatForDisplayJp) {
   AddressData address;
   address.country_code = "JP";
-  address.language_code = "ja";
   address.administrative_area = "東京都";
   address.locality = "渋谷区";
   address.postal_code = "150-8512";
   address.address_lines.push_back("桜丘町26-1");
   address.address_lines.push_back("セルリアンタワー6階");
   address.organization = "グーグル株式会社";
   address.recipient = "村上 美紀";
 
   std::vector<std::string> actual;
   address.FormatForDisplay(&actual);
 
   std::vector<std::string> expected;
   expected.push_back("〒" + address.postal_code);
   expected.push_back(address.administrative_area + address.locality);
   expected.insert(expected.end(),
                   address.address_lines.begin(),
                   address.address_lines.end());
   expected.push_back(address.organization);
   expected.push_back(address.recipient);
 
   EXPECT_EQ(expected, actual);
 }
-
-TEST(AddressDataTest, FormatForDisplayJpLatn) {
-  AddressData address;
-  address.country_code = "JP";
-  address.language_code = "ja-latn";
-  address.administrative_area = "Tokyo";
-  address.locality = "Shibuya-ku";
-  address.postal_code = "150-8512";
-  address.address_lines.push_back("26-1 Sakuragaoka-cho");
-  address.address_lines.push_back("Cerulean Tower 6F");
-  address.organization = "Google Japan Inc.";
-  address.recipient = "Miki Murakami";
-
-  std::vector<std::string> actual;
-  address.FormatForDisplay(&actual);
-
-  std::vector<std::string> expected;
-  expected.push_back(address.recipient);
-  expected.push_back(address.organization);
-  expected.insert(expected.end(),
-                  address.address_lines.begin(),
-                  address.address_lines.end());
-  expected.push_back(address.locality + ", "+ address.administrative_area);
-  expected.push_back(address.postal_code);
-
-  EXPECT_EQ(expected, actual);
-}
 
 TEST(AddressDataTest, FormatForDisplayWithStreetCi) {
   AddressData address;
   address.country_code = "CI";
   address.address_lines.push_back("Street Line 1");
   address.locality = "City Name";
   address.sorting_code = "123CEDEX";
 
   std::vector<std::string> actual;
   address.FormatForDisplay(&actual);
@@ skipping 20 matching lines @@
   std::vector<std::string> expected(
       1,
       address.sorting_code + "  " +
           address.locality + " " +
           address.sorting_code);
 
   EXPECT_EQ(expected, actual);
 }
 
 }  // namespace