Convert Pass()→std::move() in //chrome/browser/extensions

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 <stddef.h>
+#include <utility>
 
 #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"
@@ skipping 19 matching lines @@
     values.push_back(
         profile.GetInfo(autofill::AutofillType(type),
                         g_browser_process->GetApplicationLocale()));
   } else {
     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();
+    return list;
 
   for (const base::string16& value16 : values)
     list->push_back(base::UTF16ToUTF8(value16));
 
-  return list.Pass();
+  return list;
 }
 
 // Gets the string corresponding to |type| from |profile|.
 scoped_ptr<std::string> GetStringFromProfile(
     const autofill::AutofillProfile& profile,
     const autofill::ServerFieldType& type) {
   return make_scoped_ptr(
       new std::string(base::UTF16ToUTF8(profile.GetRawInfo(type))));
 }
 
@@ skipping 35 matching lines @@
   base::SplitStringUsingSubstr(label, separator, &label_pieces);
 
   // Create address metadata and add it to |address|.
   scoped_ptr<autofill_private::AutofillMetadata>
       metadata(new autofill_private::AutofillMetadata);
   metadata->summary_label = base::UTF16ToUTF8(label_pieces[0]);
   metadata->summary_sublabel.reset(new std::string(base::UTF16ToUTF8(
       label.substr(label_pieces[0].size()))));
   metadata->is_local.reset(new bool(
       profile.record_type() == autofill::AutofillProfile::LOCAL_PROFILE));
-  address->metadata = metadata.Pass();
+  address->metadata = std::move(metadata);
 
-  return address.Pass();
+  return address;
 }
 
 scoped_ptr<autofill_private::CreditCardEntry> CreditCardToCreditCardEntry(
     const autofill::CreditCard& credit_card) {
   scoped_ptr<autofill_private::CreditCardEntry>
       card(new autofill_private::CreditCardEntry);
 
   // Add all credit card fields to the entry.
   card->guid.reset(new std::string(credit_card.guid()));
   card->name.reset(new std::string(base::UTF16ToUTF8(
@@ skipping 10 matching lines @@
       metadata(new autofill_private::AutofillMetadata);
   std::pair<base::string16, base::string16> label_pieces =
       credit_card.LabelPieces();
   metadata->summary_label = base::UTF16ToUTF8(label_pieces.first);
   metadata->summary_sublabel.reset(new std::string(base::UTF16ToUTF8(
       label_pieces.second)));
   metadata->is_local.reset(new bool(
       credit_card.record_type() == autofill::CreditCard::LOCAL_CARD));
   metadata->is_cached.reset(new bool(
       credit_card.record_type() == autofill::CreditCard::FULL_SERVER_CARD));
-  card->metadata = metadata.Pass();
+  card->metadata = std::move(metadata);
 
-  return card.Pass();
+  return card;
 }
 
 }  // namespace
 
 namespace extensions {
 
 namespace autofill_util {
 
 scoped_ptr<AddressEntryList> GenerateAddressList(
     const autofill::PersonalDataManager& personal_data) {
   const std::vector<autofill::AutofillProfile*>& profiles =
       personal_data.GetProfiles();
   std::vector<base::string16> labels;
   autofill::AutofillProfile::CreateDifferentiatingLabels(
       profiles,
       g_browser_process->GetApplicationLocale(),
       &labels);
   DCHECK_EQ(labels.size(), profiles.size());
 
   scoped_ptr<AddressEntryList> list(new AddressEntryList);
   for (size_t i = 0; i < profiles.size(); ++i) {
     autofill_private::AddressEntry* entry =
         ProfileToAddressEntry(*profiles[i], labels[i]).release();
     list->push_back(linked_ptr<autofill_private::AddressEntry>(entry));
   }
 
-  return list.Pass();
+  return list;
 }
 
 scoped_ptr<CreditCardEntryList> GenerateCreditCardList(
     const autofill::PersonalDataManager& personal_data) {
   const std::vector<autofill::CreditCard*>& cards =
       personal_data.GetCreditCards();
 
   scoped_ptr<CreditCardEntryList> list(new CreditCardEntryList);
   for (const autofill::CreditCard* card : cards) {
     autofill_private::CreditCardEntry* entry =
         CreditCardToCreditCardEntry(*card).release();
     list->push_back(linked_ptr<autofill_private::CreditCardEntry>(entry));
   }
 
-  return list.Pass();
+  return list;
 }
 
 }  // namespace autofill_util
 
 }  // namespace extensions