More work on removing variants from Autofill

chrome/browser/extensions/api/autofill_private/autofill_util.cc

 // Copyright 2015 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/extensions/api/autofill_private/autofill_util.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/api/settings_private/prefs_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/api/autofill_private.h"
 #include "chrome/common/pref_names.h"
 #include "components/autofill/core/browser/autofill_profile.h"
 #include "components/autofill/core/browser/autofill_type.h"
 #include "components/autofill/core/browser/credit_card.h"
 #include "components/autofill/core/browser/field_types.h"
 #include "grit/components_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace autofill_private = extensions::api::autofill_private;
 
 namespace {
 
 // Get the multi-valued element for |type| and return it as a |vector|.
+// TODO(khorimoto): remove this function since multi-valued types are
+// deprecated.
 scoped_ptr<std::vector<std::string>> GetValueList(
     const autofill::AutofillProfile& profile, autofill::ServerFieldType type) {
   scoped_ptr<std::vector<std::string>> list(new std::vector<std::string>);
 
   std::vector<base::string16> values;
   if (autofill::AutofillType(type).group() == autofill::NAME) {
-    profile.GetMultiInfo(
-        autofill::AutofillType(type),
-        g_browser_process->GetApplicationLocale(),
-        &values);
+    values.push_back(
+        profile.GetInfo(autofill::AutofillType(type),
+                        g_browser_process->GetApplicationLocale()));
   } else {
-    profile.GetRawMultiInfo(type, &values);
+    values.push_back(profile.GetRawInfo(type));
   }
 
   // |Get[Raw]MultiInfo()| always returns at least one, potentially empty, item.
   // If this is the case, there is no info to return, so return an empty vector.
   if (values.size() == 1 && values.front().empty())
     return list.Pass();
 
   for (const base::string16& value16 : values)
     list->push_back(base::UTF16ToUTF8(value16));
 
@@ skipping 129 matching lines @@
         CreditCardToCreditCardEntry(*card).release();
     list->push_back(linked_ptr<autofill_private::CreditCardEntry>(entry));
   }
 
   return list.Pass();
 }
 
 }  // namespace autofill_util
 
 }  // namespace extensions