Add back organization field for autofill settings.

components/autofill/core/browser/address_i18n_unittest.cc

 // 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 "components/autofill/core/browser/address_i18n.h"
 
 #include <string>
 #include <vector>
 
 #include "base/guid.h"
 #include "base/memory/scoped_ptr.h"
 #include "components/autofill/core/browser/autofill_profile.h"
 #include "components/autofill/core/browser/autofill_test_utils.h"
 #include "components/autofill/core/browser/field_types.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_data.h"
 #include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_field.h"
 
 namespace autofill {
 namespace i18n {
 
 using ::i18n::addressinput::AddressData;
 using ::i18n::addressinput::AddressField;
 
 using ::i18n::addressinput::ADMIN_AREA;
 using ::i18n::addressinput::COUNTRY;
 using ::i18n::addressinput::DEPENDENT_LOCALITY;
 using ::i18n::addressinput::LOCALITY;
+using ::i18n::addressinput::ORGANIZATION;
 using ::i18n::addressinput::POSTAL_CODE;
 using ::i18n::addressinput::RECIPIENT;
 using ::i18n::addressinput::SORTING_CODE;
 using ::i18n::addressinput::STREET_ADDRESS;
 
 TEST(AddressI18nTest, FieldTypeMirrorConversions) {
   static const struct {
     bool billing;
     ServerFieldType server_field;
     AddressField address_field;
   } kTestData[] = {
     {true, ADDRESS_BILLING_COUNTRY, COUNTRY},
     {true, ADDRESS_BILLING_STATE, ADMIN_AREA},
     {true, ADDRESS_BILLING_CITY, LOCALITY},
     {true, ADDRESS_BILLING_DEPENDENT_LOCALITY, DEPENDENT_LOCALITY},
     {true, ADDRESS_BILLING_SORTING_CODE, SORTING_CODE},
     {true, ADDRESS_BILLING_ZIP, POSTAL_CODE},
     {true, ADDRESS_BILLING_STREET_ADDRESS, STREET_ADDRESS},
+    {true, COMPANY_NAME, ORGANIZATION},
     {true, NAME_BILLING_FULL, RECIPIENT},
     {false, ADDRESS_HOME_COUNTRY, COUNTRY},
     {false, ADDRESS_HOME_STATE, ADMIN_AREA},
     {false, ADDRESS_HOME_CITY, LOCALITY},
     {false, ADDRESS_HOME_DEPENDENT_LOCALITY, DEPENDENT_LOCALITY},
     {false, ADDRESS_HOME_SORTING_CODE, SORTING_CODE},
     {false, ADDRESS_HOME_ZIP, POSTAL_CODE},
     {false, ADDRESS_HOME_STREET_ADDRESS, STREET_ADDRESS},
+    {false, COMPANY_NAME, ORGANIZATION},
     {false, NAME_FULL, RECIPIENT},
   };
 
   for (size_t i = 0; i < arraysize(kTestData); ++i) {
     AddressField address_field;
     EXPECT_TRUE(FieldForType(kTestData[i].server_field, &address_field));
     EXPECT_EQ(kTestData[i].address_field, address_field);
 
     ServerFieldType server_field =
         TypeForField(kTestData[i].address_field, kTestData[i].billing);
@@ skipping 43 matching lines @@
       CreateAddressDataFromAutofillProfile(profile, "en_US");
 
   AddressData expected;
   expected.region_code = "US";
   expected.address_line.push_back("666 Erebus St.");
   expected.address_line.push_back("Apt 8");
   expected.administrative_area = "CA";
   expected.locality = "Elysium";
   expected.postal_code = "91111";
   expected.language_code = "en";
+  expected.organization = "Underworld";
   expected.recipient = "John H. Doe";
 
   EXPECT_EQ(expected, *actual);
 }
 
 }  // namespace i18n
 }  // namespace autofill