Add back organization field for autofill settings.

chrome/browser/ui/autofill/data_model_wrapper.cc

 // Copyright (c) 2012 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 "chrome/browser/ui/autofill/data_model_wrapper.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 43 matching lines @@
   base::string16 phone =
       GetInfoForDisplay(AutofillType(PHONE_HOME_WHOLE_NUMBER));
   if (phone.empty())
     return false;
 
   // Format the address.
   scoped_ptr< ::i18n::addressinput::AddressData> address_data =
       i18n::CreateAddressData(
           base::Bind(&DataModelWrapper::GetInfo, base::Unretained(this)));
   address_data->language_code = GetLanguageCode();
+  // Interactive autofill dialog does not display organization field.
+  address_data->organization.clear();
   std::vector<std::string> lines;
   ::i18n::addressinput::GetFormattedNationalAddress(*address_data, &lines);
 
   std::string single_line;
   ::i18n::addressinput::GetFormattedNationalAddressLine(
        *address_data, &single_line);
 
   // Email and phone number aren't part of address formatting.
   base::string16 non_address_info;
   base::string16 email = GetInfoForDisplay(AutofillType(EMAIL_ADDRESS));
@@ skipping 320 matching lines @@
   }
 
   return base::UTF8ToUTF16(address_->GetFieldValue(field));
 }
 
 const std::string& I18nAddressDataWrapper::GetLanguageCode() const {
   return address_->language_code;
 }
 
 }  // namespace autofill