Revert of [Sync] Eliminate verifier profile from sync_integration_tests

chrome/browser/sync/test/integration/autofill_helper.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/sync/test/integration/autofill_helper.h"
 
 #include <stddef.h>
 
 #include "base/guid.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
@@ skipping 297 matching lines @@
   EXPECT_CALL(observer, OnPersonalDataChanged()).
       WillOnce(QuitUIMessageLoop());
   PersonalDataManager* pdm = GetPersonalDataManager(profile);
   pdm->AddObserver(&observer);
   pdm->SetCreditCards(credit_cards);
   base::MessageLoop::current()->Run();
   pdm->RemoveObserver(&observer);
 }
 
 void AddProfile(int profile, const AutofillProfile& autofill_profile) {
-  const std::vector<AutofillProfile*>& all_profiles =
-      GetAllAutoFillProfiles(profile);
+  const std::vector<AutofillProfile*>& all_profiles = GetAllProfiles(profile);
   std::vector<AutofillProfile> autofill_profiles;
   for (size_t i = 0; i < all_profiles.size(); ++i)
     autofill_profiles.push_back(*all_profiles[i]);
   autofill_profiles.push_back(autofill_profile);
   autofill_helper::SetProfiles(profile, &autofill_profiles);
 }
 
 void RemoveProfile(int profile, const std::string& guid) {
-  const std::vector<AutofillProfile*>& all_profiles =
-      GetAllAutoFillProfiles(profile);
+  const std::vector<AutofillProfile*>& all_profiles = GetAllProfiles(profile);
   std::vector<AutofillProfile> autofill_profiles;
   for (size_t i = 0; i < all_profiles.size(); ++i) {
     if (all_profiles[i]->guid() != guid)
       autofill_profiles.push_back(*all_profiles[i]);
   }
   autofill_helper::SetProfiles(profile, &autofill_profiles);
 }
 
 void UpdateProfile(int profile,
                    const std::string& guid,
                    const AutofillType& type,
                    const base::string16& value) {
-  const std::vector<AutofillProfile*>& all_profiles =
-      GetAllAutoFillProfiles(profile);
+  const std::vector<AutofillProfile*>& all_profiles = GetAllProfiles(profile);
   std::vector<AutofillProfile> profiles;
   for (size_t i = 0; i < all_profiles.size(); ++i) {
     profiles.push_back(*all_profiles[i]);
     if (all_profiles[i]->guid() == guid)
       profiles.back().SetRawInfo(type.GetStorableType(), value);
   }
   autofill_helper::SetProfiles(profile, &profiles);
 }
 
-const std::vector<AutofillProfile*>& GetAllAutoFillProfiles(
+const std::vector<AutofillProfile*>& GetAllProfiles(
     int profile) {
   MockPersonalDataManagerObserver observer;
   EXPECT_CALL(observer, OnPersonalDataChanged()).
       WillOnce(QuitUIMessageLoop());
   PersonalDataManager* pdm = GetPersonalDataManager(profile);
   pdm->AddObserver(&observer);
   pdm->Refresh();
   base::MessageLoop::current()->Run();
   pdm->RemoveObserver(&observer);
   return pdm->web_profiles();
 }
 
 int GetProfileCount(int profile) {
-  return GetAllAutoFillProfiles(profile).size();
+  return GetAllProfiles(profile).size();
 }
 
 int GetKeyCount(int profile) {
   return GetAllKeys(profile).size();
 }
 
 namespace {
 
 bool ProfilesMatchImpl(
     int profile_a,
@@ skipping 27 matching lines @@
              << profile_b << ".";
     return false;
   }
   return true;
 }
 
 }  // namespace
 
 bool ProfilesMatch(int profile_a, int profile_b) {
   const std::vector<AutofillProfile*>& autofill_profiles_a =
-      GetAllAutoFillProfiles(profile_a);
+      GetAllProfiles(profile_a);
   const std::vector<AutofillProfile*>& autofill_profiles_b =
-      GetAllAutoFillProfiles(profile_b);
+      GetAllProfiles(profile_b);
   return ProfilesMatchImpl(
       profile_a, autofill_profiles_a, profile_b, autofill_profiles_b);
 }
 
 bool AllProfilesMatch() {
   for (int i = 1; i < test()->num_clients(); ++i) {
     if (!ProfilesMatch(0, i)) {
       DVLOG(1) << "Profile " << i << "does not contain the same autofill "
                                      "profiles as profile 0.";
       return false;
@@ skipping 78 matching lines @@
 
 }  // namespace
 
 bool AwaitProfilesMatch(int a, int b) {
   ProfilesMatchStatusChecker checker(a, b);
   checker.Wait();
   return !checker.TimedOut();
 }
 
 }  // namespace autofill_helper