Allow sync integration tests to operate on multiple datatypes: Typed Urls

chrome/test/live_sync/autofill_helper.cc

 // Copyright (c) 2011 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/test/live_sync/autofill_helper.h"
 
 #include "chrome/browser/autofill/autofill_common_test.h"
 #include "chrome/browser/autofill/autofill_profile.h"
 #include "chrome/browser/autofill/autofill_type.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_test_util.h"
 #include "chrome/browser/webdata/autofill_entry.h"
 #include "chrome/browser/webdata/autofill_table.h"
 #include "chrome/browser/webdata/web_database.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/test/live_sync/live_sync_test.h"
+#include "chrome/test/live_sync/sync_datatype_helper.h"
 #include "chrome/test/base/thread_observer_helper.h"
 #include "webkit/glue/form_field.h"
 
 using base::WaitableEvent;
+using sync_datatype_helper::test;
 using testing::_;
 
 namespace {
+
 class GetAllAutofillEntries
     : public base::RefCountedThreadSafe<GetAllAutofillEntries> {
  public:
   explicit GetAllAutofillEntries(WebDataService* web_data_service)
       : web_data_service_(web_data_service),
         done_event_(false, false) {}
 
   void Init() {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     BrowserThread::PostTask(
@@ skipping 38 matching lines @@
   }
 };
 
 class MockPersonalDataManagerObserver : public PersonalDataManager::Observer {
  public:
   MOCK_METHOD0(OnPersonalDataChanged, void());
 };
 
 }  // namespace
 
-AutofillHelper::AutofillHelper() {}
+namespace autofill_helper {
 
-AutofillHelper::~AutofillHelper() {}
-
-// static
-AutofillProfile AutofillHelper::CreateAutofillProfile(ProfileType type) {
+AutofillProfile CreateAutofillProfile(ProfileType type) {
   AutofillProfile profile;
   switch (type) {
     case PROFILE_MARION:
       autofill_test::SetProfileInfoWithGuid(&profile,
           "C837507A-6C3B-4872-AC14-5113F157D668",
           "Marion", "Mitchell", "Morrison",
           "johnwayne@me.xyz", "Fox",
           "123 Zoo St.", "unit 5", "Hollywood", "CA",
           "91601", "US", "12345678910", "01987654321");
       break;
@@ skipping 14 matching lines @@
       break;
     case PROFILE_NULL:
       autofill_test::SetProfileInfoWithGuid(&profile,
           "FE461507-7E13-4198-8E66-74C7DB6D8322",
           "", "", "", "", "", "", "", "", "", "", "", "", "");
       break;
   }
   return profile;
 }
 
-// static
-WebDataService* AutofillHelper::GetWebDataService(int index) {
+WebDataService* GetWebDataService(int index) {
   return test()->GetProfile(index)->GetWebDataService(Profile::EXPLICIT_ACCESS);
 }
 
-// static
-PersonalDataManager* AutofillHelper::GetPersonalDataManager(int index) {
+PersonalDataManager* GetPersonalDataManager(int index) {
   return test()->GetProfile(index)->GetPersonalDataManager();
 }
 
-// static
-void AutofillHelper::AddKeys(int profile,
+void AddKeys(int profile,
                              const std::set<AutofillKey>& keys) {
   std::vector<webkit_glue::FormField> form_fields;
   for (std::set<AutofillKey>::const_iterator i = keys.begin();
        i != keys.end();
        ++i) {
     form_fields.push_back(webkit_glue::FormField(string16(),
                                                  (*i).name(),
                                                  (*i).value(),
                                                  string16(),
                                                  0,
                                                  false));
   }
 
   WaitableEvent done_event(false, false);
   scoped_refptr<AutofillDBThreadObserverHelper> observer_helper(
       new AutofillDBThreadObserverHelper());
   observer_helper->Init();
 
   EXPECT_CALL(*observer_helper->observer(), Observe(_, _, _)).
       WillOnce(SignalEvent(&done_event));
   WebDataService* wds = GetWebDataService(profile);
   wds->AddFormFields(form_fields);
   done_event.Wait();
 }
 
-// static
-void AutofillHelper::RemoveKey(int profile, const AutofillKey& key) {
+void RemoveKey(int profile, const AutofillKey& key) {
   WaitableEvent done_event(false, false);
   scoped_refptr<AutofillDBThreadObserverHelper> observer_helper(
       new AutofillDBThreadObserverHelper());
   observer_helper->Init();
 
   EXPECT_CALL(*observer_helper->observer(), Observe(_, _, _)).
       WillOnce(SignalEvent(&done_event));
   WebDataService* wds = GetWebDataService(profile);
   wds->RemoveFormValueForElementName(key.name(), key.value());
   done_event.Wait();
 }
 
-// static
-std::set<AutofillEntry> AutofillHelper::GetAllKeys(int profile) {
+std::set<AutofillEntry> GetAllKeys(int profile) {
   WebDataService* wds = GetWebDataService(profile);
   scoped_refptr<GetAllAutofillEntries> get_all_entries =
       new GetAllAutofillEntries(wds);
   get_all_entries->Init();
   const std::vector<AutofillEntry>& all_entries = get_all_entries->entries();
   std::set<AutofillEntry> all_keys;
   for (std::vector<AutofillEntry>::const_iterator it = all_entries.begin();
        it != all_entries.end(); ++it) {
     all_keys.insert(*it);
   }
   return all_keys;
 }
 
-// static
-bool AutofillHelper::KeysMatch(int profile_a, int profile_b) {
+bool KeysMatch(int profile_a, int profile_b) {
   return GetAllKeys(profile_a) == GetAllKeys(profile_b);
 }
 
-// static
-void AutofillHelper::SetProfiles(
-    int profile, std::vector<AutofillProfile>* autofill_profiles) {
+void SetProfiles(int profile, std::vector<AutofillProfile>* autofill_profiles) {
   MockPersonalDataManagerObserver observer;
   EXPECT_CALL(observer, OnPersonalDataChanged()).
       WillOnce(QuitUIMessageLoop());
   PersonalDataManager* pdm = GetPersonalDataManager(profile);
   pdm->SetObserver(&observer);
   pdm->SetProfiles(autofill_profiles);
   MessageLoop::current()->Run();
   pdm->RemoveObserver(&observer);
 }
 
-// static
-void AutofillHelper::AddProfile(int profile,
-                                const AutofillProfile& autofill_profile) {
+void AddProfile(int profile, const AutofillProfile& autofill_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);
-  SetProfiles(profile, &autofill_profiles);
+  autofill_helper::SetProfiles(profile, &autofill_profiles);
 }
 
-// static
-void AutofillHelper::RemoveProfile(int profile, const std::string& guid) {
+void RemoveProfile(int profile, const std::string& guid) {
   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]);
   }
-  SetProfiles(profile, &autofill_profiles);
+  autofill_helper::SetProfiles(profile, &autofill_profiles);
 }
 
-// static
-void AutofillHelper::UpdateProfile(int profile,
+void UpdateProfile(int profile,
                                    const std::string& guid,
                                    const AutofillType& type,
                                    const string16& value) {
   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().SetInfo(type.field_type(), value);
   }
-  SetProfiles(profile, &profiles);
+  autofill_helper::SetProfiles(profile, &profiles);
 }
 
-// static
-const std::vector<AutofillProfile*>& AutofillHelper::GetAllProfiles(
+const std::vector<AutofillProfile*>& GetAllProfiles(
     int profile) {
   MockPersonalDataManagerObserver observer;
   EXPECT_CALL(observer, OnPersonalDataChanged()).
       WillOnce(QuitUIMessageLoop());
   PersonalDataManager* pdm = GetPersonalDataManager(profile);
   pdm->SetObserver(&observer);
   pdm->Refresh();
   MessageLoop::current()->Run();
   pdm->RemoveObserver(&observer);
   return pdm->web_profiles();
 }
 
-// static
-int AutofillHelper::GetProfileCount(int profile) {
+int GetProfileCount(int profile) {
   return GetAllProfiles(profile).size();
 }
 
-// static
-bool AutofillHelper::ProfilesMatch(int profile_a, int profile_b) {
+bool ProfilesMatch(int profile_a, int profile_b) {
   const std::vector<AutofillProfile*>& autofill_profiles_a =
       GetAllProfiles(profile_a);
   std::map<std::string, AutofillProfile> autofill_profiles_a_map;
   for (size_t i = 0; i < autofill_profiles_a.size(); ++i) {
     const AutofillProfile* p = autofill_profiles_a[i];
     autofill_profiles_a_map[p->guid()] = *p;
   }
 
   const std::vector<AutofillProfile*>& autofill_profiles_b =
       GetAllProfiles(profile_b);
@@ skipping 14 matching lines @@
   }
 
   if (autofill_profiles_a_map.size()) {
     LOG(ERROR) << "Entries present in Profile " << profile_a
                << " but not in " << profile_b << ".";
     return false;
   }
   return true;
 }
 
-// static
-bool AutofillHelper::AllProfilesMatch() {
+bool AllProfilesMatch() {
   for (int i = 1; i < test()->num_clients(); ++i) {
     if (!ProfilesMatch(0, i)) {
       LOG(ERROR) << "Profile " << i << "does not contain the same autofill "
                                        "profiles as profile 0.";
       return false;
     }
   }
   return true;
 }
+
+}  // namespace autofill_helper