diff options
Diffstat (limited to 'chrome/browser/sync/test/integration')
8 files changed, 19 insertions, 19 deletions
diff --git a/chrome/browser/sync/test/integration/autofill_helper.cc b/chrome/browser/sync/test/integration/autofill_helper.cc index b2deecc..60b39c6 100644 --- a/chrome/browser/sync/test/integration/autofill_helper.cc +++ b/chrome/browser/sync/test/integration/autofill_helper.cc @@ -13,14 +13,14 @@ #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/sync/test/integration/sync_test.h" #include "chrome/browser/sync/test/integration/sync_datatype_helper.h" +#include "chrome/browser/sync/test/integration/sync_test.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/base/thread_observer_helper.h" -#include "webkit/glue/form_field.h" +#include "webkit/forms/form_field.h" using base::WaitableEvent; using content::BrowserThread; @@ -133,11 +133,11 @@ PersonalDataManager* GetPersonalDataManager(int index) { } void AddKeys(int profile, const std::set<AutofillKey>& keys) { - std::vector<webkit_glue::FormField> form_fields; + std::vector<webkit::forms::FormField> form_fields; for (std::set<AutofillKey>::const_iterator i = keys.begin(); i != keys.end(); ++i) { - webkit_glue::FormField field; + webkit::forms::FormField field; field.name = i->name(); field.value = i->value(); form_fields.push_back(field); diff --git a/chrome/browser/sync/test/integration/multiple_client_passwords_sync_test.cc b/chrome/browser/sync/test/integration/multiple_client_passwords_sync_test.cc index b1c8095..83fee37 100644 --- a/chrome/browser/sync/test/integration/multiple_client_passwords_sync_test.cc +++ b/chrome/browser/sync/test/integration/multiple_client_passwords_sync_test.cc @@ -14,7 +14,7 @@ using passwords_helper::CreateTestPasswordForm; using passwords_helper::GetPasswordCount; using passwords_helper::GetPasswordStore; -using webkit_glue::PasswordForm; +using webkit::forms::PasswordForm; class MultipleClientPasswordsSyncTest : public SyncTest { public: diff --git a/chrome/browser/sync/test/integration/passwords_helper.cc b/chrome/browser/sync/test/integration/passwords_helper.cc index 5628e44..792c0dc 100644 --- a/chrome/browser/sync/test/integration/passwords_helper.cc +++ b/chrome/browser/sync/test/integration/passwords_helper.cc @@ -15,7 +15,7 @@ #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/browser_thread.h" -using webkit_glue::PasswordForm; +using webkit::forms::PasswordForm; using sync_datatype_helper::test; const std::string kFakeSignonRealm = "http://fake-signon-realm.google.com/"; diff --git a/chrome/browser/sync/test/integration/passwords_helper.h b/chrome/browser/sync/test/integration/passwords_helper.h index 197b7a0..7de3cf9 100644 --- a/chrome/browser/sync/test/integration/passwords_helper.h +++ b/chrome/browser/sync/test/integration/passwords_helper.h @@ -11,7 +11,7 @@ #include "base/time.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/test/integration/sync_test.h" -#include "webkit/glue/password_form.h" +#include "webkit/forms/password_form.h" class PasswordStore; @@ -20,21 +20,21 @@ namespace passwords_helper { // Adds the login held in |form| to the password store |store|. Even though // logins are normally added asynchronously, this method will block until the // login is added. -void AddLogin(PasswordStore* store, const webkit_glue::PasswordForm& form); +void AddLogin(PasswordStore* store, const webkit::forms::PasswordForm& form); // Update the data held in password store |store| with a modified |form|. // This method blocks until the operation is complete. -void UpdateLogin(PasswordStore* store, const webkit_glue::PasswordForm& form); +void UpdateLogin(PasswordStore* store, const webkit::forms::PasswordForm& form); // Searches |store| for all logins matching a fake signon realm used only by // LivePasswordsSyncTest and adds the results to |matches|. Note that the // caller is responsible for deleting the forms added to |matches|. void GetLogins(PasswordStore* store, - std::vector<webkit_glue::PasswordForm>& matches); + std::vector<webkit::forms::PasswordForm>& matches); // Removes the login held in |form| from the password store |store|. This // method blocks until the operation is complete. -void RemoveLogin(PasswordStore* store, const webkit_glue::PasswordForm& form); +void RemoveLogin(PasswordStore* store, const webkit::forms::PasswordForm& form); // Removes all password forms from the password store |store|. void RemoveLogins(PasswordStore* store); @@ -73,7 +73,7 @@ int GetVerifierPasswordCount(); // Creates a test password form with a well known fake signon realm used only // by LivePasswordsSyncTest based on |index|. -webkit_glue::PasswordForm CreateTestPasswordForm(int index); +webkit::forms::PasswordForm CreateTestPasswordForm(int index); } // namespace passwords_helper diff --git a/chrome/browser/sync/test/integration/performance/passwords_sync_perf_test.cc b/chrome/browser/sync/test/integration/performance/passwords_sync_perf_test.cc index a8ed771..58f7d69 100644 --- a/chrome/browser/sync/test/integration/performance/passwords_sync_perf_test.cc +++ b/chrome/browser/sync/test/integration/performance/passwords_sync_perf_test.cc @@ -34,7 +34,7 @@ class PasswordsSyncPerfTest : public SyncTest { private: // Returns a new unique login. - webkit_glue::PasswordForm NextLogin(); + webkit::forms::PasswordForm NextLogin(); // Returns a new unique password value. std::string NextPassword(); @@ -50,9 +50,9 @@ void PasswordsSyncPerfTest::AddLogins(int profile, int num_logins) { } void PasswordsSyncPerfTest::UpdateLogins(int profile) { - std::vector<webkit_glue::PasswordForm> logins; + std::vector<webkit::forms::PasswordForm> logins; GetLogins(GetPasswordStore(profile), logins); - for (std::vector<webkit_glue::PasswordForm>::iterator it = logins.begin(); + for (std::vector<webkit::forms::PasswordForm>::iterator it = logins.begin(); it != logins.end(); ++it) { (*it).password_value = ASCIIToUTF16(NextPassword()); UpdateLogin(GetPasswordStore(profile), (*it)); @@ -63,7 +63,7 @@ void PasswordsSyncPerfTest::RemoveLogins(int profile) { passwords_helper::RemoveLogins(GetPasswordStore(profile)); } -webkit_glue::PasswordForm PasswordsSyncPerfTest::NextLogin() { +webkit::forms::PasswordForm PasswordsSyncPerfTest::NextLogin() { return CreateTestPasswordForm(password_number_++); } diff --git a/chrome/browser/sync/test/integration/single_client_passwords_sync_test.cc b/chrome/browser/sync/test/integration/single_client_passwords_sync_test.cc index 73c1a9d..8adfae0 100644 --- a/chrome/browser/sync/test/integration/single_client_passwords_sync_test.cc +++ b/chrome/browser/sync/test/integration/single_client_passwords_sync_test.cc @@ -15,7 +15,7 @@ using passwords_helper::GetVerifierPasswordCount; using passwords_helper::GetVerifierPasswordStore; using passwords_helper::ProfileContainsSamePasswordFormsAsVerifier; -using webkit_glue::PasswordForm; +using webkit::forms::PasswordForm; class SingleClientPasswordsSyncTest : public SyncTest { public: diff --git a/chrome/browser/sync/test/integration/sync_errors_test.cc b/chrome/browser/sync/test/integration/sync_errors_test.cc index 1ae729d..7e702efb 100644 --- a/chrome/browser/sync/test/integration/sync_errors_test.cc +++ b/chrome/browser/sync/test/integration/sync_errors_test.cc @@ -20,7 +20,7 @@ using passwords_helper::GetVerifierPasswordCount; using passwords_helper::GetVerifierPasswordStore; using passwords_helper::ProfileContainsSamePasswordFormsAsVerifier; -using webkit_glue::PasswordForm; +using webkit::forms::PasswordForm; class SyncErrorTest : public SyncTest{ public: diff --git a/chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc b/chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc index e5164c7..dc837fb 100644 --- a/chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc +++ b/chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc @@ -23,7 +23,7 @@ using passwords_helper::RemoveLogins; using passwords_helper::SetPassphrase; using passwords_helper::UpdateLogin; -using webkit_glue::PasswordForm; +using webkit::forms::PasswordForm; static const char* kValidPassphrase = "passphrase!"; static const char* kAnotherValidPassphrase = "another passphrase!"; |