| Index: chrome/browser/sync/glue/autofill_change_processor.cc
|
| diff --git a/chrome/browser/sync/glue/autofill_change_processor.cc b/chrome/browser/sync/glue/autofill_change_processor.cc
|
| index eed58fcb4798e782f771147eaadec84e00ef70d0..9191166467f8e75b368883df66fa3080947fdd2d 100644
|
| --- a/chrome/browser/sync/glue/autofill_change_processor.cc
|
| +++ b/chrome/browser/sync/glue/autofill_change_processor.cc
|
| @@ -7,9 +7,9 @@
|
| #include <string>
|
| #include <vector>
|
|
|
| +#include "base/guid.h"
|
| #include "base/string_util.h"
|
| #include "base/utf_string_conversions.h"
|
| -#include "chrome/browser/guid.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/autofill/personal_data_manager.h"
|
| #include "chrome/browser/sync/glue/autofill_change_processor2.h"
|
| @@ -338,7 +338,7 @@ void AutofillChangeProcessor::ApplySyncAutofillProfileChange(
|
|
|
| switch (action) {
|
| case sync_api::SyncManager::ChangeRecord::ACTION_ADD: {
|
| - std::string guid(guid::GenerateGUID());
|
| + std::string guid(base::GenerateGUID());
|
| scoped_ptr<AutoFillProfile> p(new AutoFillProfile);
|
| p->set_guid(guid);
|
| AutofillModelAssociator::FillProfileWithServerData(p.get(),
|
|
|