autofill names - dont parse when calling SetRawInfo(FULL_NAME)

chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc

 // Copyright 2013 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/autofill_dialog_controller_impl.h"
 
 #include <algorithm>
 #include <map>
 #include <string>
 
@@ skipping 183 matching lines @@
           field.Type().GetStorableType())));
 }
 
 // Initializes |form_group| from user-entered data.
 void FillFormGroupFromOutputs(const FieldValueMap& detail_outputs,
                               FormGroup* form_group) {
   for (FieldValueMap::const_iterator iter = detail_outputs.begin();
        iter != detail_outputs.end(); ++iter) {
     ServerFieldType type = iter->first;
     if (!iter->second.empty()) {
-      if (type == ADDRESS_HOME_COUNTRY || type == ADDRESS_BILLING_COUNTRY) {
-        form_group->SetInfo(AutofillType(type),
-                            iter->second,
-                            g_browser_process->GetApplicationLocale());
-      } else {
-        form_group->SetRawInfo(
-            AutofillType(type).GetStorableType(), iter->second);
-      }
+      form_group->SetInfo(AutofillType(type),
+                          iter->second,
+                          g_browser_process->GetApplicationLocale());
     }
   }
 }
 
 // Get billing info from |output| and put it into |card|, |cvc|, and |profile|.
 // These outparams are required because |card|/|profile| accept different types
 // of raw info, and CreditCard doesn't save CVCs.
 void GetBillingInfoFromOutputs(const FieldValueMap& output,
                                CreditCard* card,
                                base::string16* cvc,
                                AutofillProfile* profile) {
   for (FieldValueMap::const_iterator it = output.begin();
        it != output.end(); ++it) {
     const ServerFieldType type = it->first;
     base::string16 trimmed;
     base::TrimWhitespace(it->second, base::TRIM_ALL, &trimmed);
 
     // Special case CVC as CreditCard just swallows it.
     if (type == CREDIT_CARD_VERIFICATION_CODE) {
       if (cvc)
         cvc->assign(trimmed);
-    } else if (type == ADDRESS_HOME_COUNTRY ||
-               type == ADDRESS_BILLING_COUNTRY) {
-      if (profile) {
-        profile->SetInfo(AutofillType(type),
-                         trimmed,
-                         g_browser_process->GetApplicationLocale());
-      }
+    } else if (common::IsCreditCardType(type)) {
+      card->SetRawInfo(type, trimmed);
     } else {
       // Copy the credit card name to |profile| in addition to |card| as
       // wallet::Instrument requires a recipient name for its billing address.
       if (card && type == NAME_FULL)
         card->SetRawInfo(CREDIT_CARD_NAME, trimmed);
 
-      if (common::IsCreditCardType(type)) {
-        if (card)
-          card->SetRawInfo(type, trimmed);
-      } else if (profile) {
-        profile->SetRawInfo(AutofillType(type).GetStorableType(), trimmed);
+      if (profile) {
+        profile->SetInfo(AutofillType(AutofillType(type).GetStorableType()),
+                         trimmed,
+                         g_browser_process->GetApplicationLocale());
       }
     }
   }
 }
 
 // Returns the containing window for the given |web_contents|. The containing
 // window might be a browser window for a Chrome tab, or it might be an app
 // window for a platform app.
 ui::BaseWindow* GetBaseWindowForWebContents(
     content::WebContents* web_contents) {
@@ skipping 2783 matching lines @@
             cards[i]->guid(),
             cards[i]->Label(),
             rb.GetImageNamed(CreditCard::IconResourceId(cards[i]->type())));
         suggested_cc_.SetEnabled(
             cards[i]->guid(),
             !ShouldDisallowCcType(cards[i]->TypeForDisplay()));
       }
 
       const std::vector<AutofillProfile*>& profiles = manager->GetProfiles();
       std::vector<base::string16> labels;
-      AutofillProfile::CreateDifferentiatingLabels(profiles, &labels);
+      AutofillProfile::CreateDifferentiatingLabels(
+          profiles,
+          g_browser_process->GetApplicationLocale(),
+          &labels);
       DCHECK_EQ(labels.size(), profiles.size());
       for (size_t i = 0; i < profiles.size(); ++i) {
         const AutofillProfile& profile = *profiles[i];
         if (!i18ninput::AddressHasCompleteAndVerifiedData(
                 profile, g_browser_process->GetApplicationLocale())) {
           continue;
         }
 
         // Don't add variants for addresses: name is part of credit card and
         // we'll just ignore email and phone number variants.
@@ skipping 1063 matching lines @@
   view_->UpdateButtonStrip();
 }
 
 void AutofillDialogControllerImpl::FetchWalletCookie() {
   net::URLRequestContextGetter* request_context = profile_->GetRequestContext();
   signin_helper_.reset(new wallet::WalletSigninHelper(this, request_context));
   signin_helper_->StartWalletCookieValueFetch();
 }
 
 }  // namespace autofill