| Index: chrome/browser/sync/glue/password_change_processor.cc
|
| diff --git a/chrome/browser/sync/glue/password_change_processor.cc b/chrome/browser/sync/glue/password_change_processor.cc
|
| index bb10d9144061ba8c0bd7e8d639f141469bbf54ed..9a2c6b406604b826ca564bb29bb22b5ca1b84885 100644
|
| --- a/chrome/browser/sync/glue/password_change_processor.cc
|
| +++ b/chrome/browser/sync/glue/password_change_processor.cc
|
| @@ -18,12 +18,12 @@
|
| #include "chrome/common/chrome_notification_types.h"
|
| #include "content/public/browser/notification_details.h"
|
| #include "content/public/browser/notification_source.h"
|
| +#include "content/public/common/password_form.h"
|
| #include "sync/internal_api/public/change_record.h"
|
| #include "sync/internal_api/public/read_node.h"
|
| #include "sync/internal_api/public/write_node.h"
|
| #include "sync/internal_api/public/write_transaction.h"
|
| #include "sync/protocol/password_specifics.pb.h"
|
| -#include "webkit/forms/password_form.h"
|
|
|
| using content::BrowserThread;
|
|
|
| @@ -192,7 +192,7 @@ void PasswordChangeProcessor::ApplyChangesFromSyncModel(
|
| syncer::ExtraPasswordChangeRecordData* extra =
|
| it->extra.get();
|
| const sync_pb::PasswordSpecificsData& password = extra->unencrypted();
|
| - webkit::forms::PasswordForm form;
|
| + content::PasswordForm form;
|
| PasswordModelAssociator::CopyPassword(password, &form);
|
| deleted_passwords_.push_back(form);
|
| model_associator_->Disassociate(it->id);
|
| @@ -212,7 +212,7 @@ void PasswordChangeProcessor::ApplyChangesFromSyncModel(
|
|
|
| const sync_pb::PasswordSpecificsData& password_data =
|
| sync_node.GetPasswordSpecifics();
|
| - webkit::forms::PasswordForm password;
|
| + content::PasswordForm password;
|
| PasswordModelAssociator::CopyPassword(password_data, &password);
|
|
|
| if (syncer::ChangeRecord::ACTION_ADD == it->action) {
|
|
|