Cleanup return values in autofill_sync

chrome/browser/sync/test/integration/performance/autofill_sync_perf_test.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 "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/sync/test/integration/autofill_helper.h"
 #include "chrome/browser/sync/test/integration/bookmarks_helper.h"
 #include "chrome/browser/sync/test/integration/performance/sync_timing_helper.h"
 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
@@ skipping 37 matching lines @@
   void UpdateProfiles(int profile);
 
   // Removes all autofill profiles from |profile|.
   void RemoveProfiles(int profile);
 
   // Adds |num_keys| new autofill keys to the sync profile |profile|.
   void AddKeys(int profile, int num_keys);
 
  private:
   // Returns a new unique autofill profile.
-  const AutofillProfile NextAutofillProfile();
+  const AutofillProfile& NextAutofillProfile();
 
   // Returns a new unique autofill key.
-  const AutofillKey NextAutofillKey();
+  const AutofillKey& NextAutofillKey();
 
   // Returns an unused unique guid.
-  const std::string NextGUID();
+  const std::string& NextGUID();
 
   // Returns a unique guid based on the input integer |n|.
-  const std::string IntToGUID(int n);
+  const std::string& IntToGUID(int n);
 
   // Returns a new unused unique name.
-  const std::string NextName();
+  const std::string& NextName();
 
   // Returns a unique name based on the input integer |n|.
-  const std::string IntToName(int n);
+  const std::string& IntToName(int n);
 
   // Returns a new unused unique value for autofill entries.
-  const std::string NextValue();
+  const std::string& NextValue();
 
   // Returnes a unique value based on the input integer |n|.
-  const std::string IntToValue(int n);
+  const std::string& IntToValue(int n);
 
   int guid_number_;
   int name_number_;
   int value_number_;
   DISALLOW_COPY_AND_ASSIGN(AutofillSyncPerfTest);
 };
 
 void AutofillSyncPerfTest::AddProfiles(int profile, int num_profiles) {
   const std::vector<AutofillProfile*>& all_profiles =
       GetAllProfiles(profile);
@@ skipping 25 matching lines @@
 }
 
 void AutofillSyncPerfTest::AddKeys(int profile, int num_keys) {
   std::set<AutofillKey> keys;
   for (int i = 0; i < num_keys; ++i) {
     keys.insert(NextAutofillKey());
   }
   autofill_helper::AddKeys(profile, keys);
 }
 
-const AutofillProfile AutofillSyncPerfTest::NextAutofillProfile() {
+const AutofillProfile& AutofillSyncPerfTest::NextAutofillProfile() {
   AutofillProfile profile;
   autofill::test::SetProfileInfoWithGuid(&profile, NextGUID().c_str(),
                                          NextName().c_str(), "", "", "", "", "",
                                          "", "", "", "", "", "");
   return profile;
 }
 
-const AutofillKey AutofillSyncPerfTest::NextAutofillKey() {
+const AutofillKey& AutofillSyncPerfTest::NextAutofillKey() {
   return AutofillKey(NextName().c_str(), NextName().c_str());
 }
 
-const std::string AutofillSyncPerfTest::NextGUID() {
+const std::string& AutofillSyncPerfTest::NextGUID() {
   return IntToGUID(guid_number_++);
 }
 
-const std::string AutofillSyncPerfTest::IntToGUID(int n) {
+const std::string& AutofillSyncPerfTest::IntToGUID(int n) {
   return base::StringPrintf("00000000-0000-0000-0000-%012X", n);
 }
 
-const std::string AutofillSyncPerfTest::NextName() {
+const std::string& AutofillSyncPerfTest::NextName() {
   return IntToName(name_number_++);
 }
 
-const std::string AutofillSyncPerfTest::IntToName(int n) {
+const std::string& AutofillSyncPerfTest::IntToName(int n) {
   return base::StringPrintf("Name%d", n);
 }
 
-const std::string AutofillSyncPerfTest::NextValue() {
+const std::string& AutofillSyncPerfTest::NextValue() {
   return IntToValue(value_number_++);
 }
 
-const std::string AutofillSyncPerfTest::IntToValue(int n) {
+const std::string& AutofillSyncPerfTest::IntToValue(int n) {
   return base::StringPrintf("Value%d", n);
 }
 
 void ForceSync(int profile) {
   static int id = 0;
   ++id;
   EXPECT_TRUE(
       bookmarks_helper::AddURL(profile, 0,
                                bookmarks_helper::IndexedURLTitle(id),
                                GURL(bookmarks_helper::IndexedURL(id))) != NULL);
@@ skipping 33 matching lines @@
   ASSERT_EQ(kNumKeys, GetKeyCount(1));
   SyncTimingHelper::PrintResult("autofill", "add_autofill_keys", dt);
 
   RemoveKeys(0);
   // TODO(lipalani): fix this. The following line is added to force sync.
   ForceSync(0);
   dt = SyncTimingHelper::TimeMutualSyncCycle(GetClient(0), GetClient(1));
   ASSERT_EQ(0, GetKeyCount(1));
   SyncTimingHelper::PrintResult("autofill", "delete_autofill_keys", dt);
 }