| Index: chrome/browser/sync/glue/autofill_model_associator.cc
|
| diff --git a/chrome/browser/sync/glue/autofill_model_associator.cc b/chrome/browser/sync/glue/autofill_model_associator.cc
|
| index cc5a37f9d5f5ede3347eacfa5155c3eac9d58872..2d7b9751256c3ec271c1c1460bae3a26e8873587 100644
|
| --- a/chrome/browser/sync/glue/autofill_model_associator.cc
|
| +++ b/chrome/browser/sync/glue/autofill_model_associator.cc
|
| @@ -6,13 +6,13 @@
|
|
|
| #include <vector>
|
|
|
| +#include "base/guid.h"
|
| #include "base/task.h"
|
| #include "base/time.h"
|
| #include "base/string_number_conversions.h"
|
| #include "base/utf_string_conversions.h"
|
| #include "chrome/browser/autofill/autofill_profile.h"
|
| #include "chrome/browser/browser_thread.h"
|
| -#include "chrome/browser/guid.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/sync/engine/syncapi.h"
|
| #include "chrome/browser/sync/glue/autofill_change_processor.h"
|
| @@ -286,7 +286,7 @@ struct CompareProfiles
|
| AutoFillProfile* AutofillModelAssociator::FindCorrespondingNodeFromWebDB(
|
| const sync_pb::AutofillProfileSpecifics& profile,
|
| const std::vector<AutoFillProfile*>& all_profiles_from_db) {
|
| - static std::string guid(guid::GenerateGUID());
|
| + static std::string guid(base::GenerateGUID());
|
| AutoFillProfile p;
|
| p.set_guid(guid);
|
| if (!FillProfileWithServerData(&p, profile)) {
|
| @@ -341,7 +341,7 @@ void AutofillModelAssociator::AddNativeProfileIfNeeded(
|
| Associate(&guid, sync_id);
|
| return;
|
| } else { // Create a new node.
|
| - std::string guid = guid::GenerateGUID();
|
| + std::string guid = base::GenerateGUID();
|
| Associate(&guid, node.GetId());
|
| AutoFillProfile* p = new AutoFillProfile(guid);
|
| FillProfileWithServerData(p, profile);
|
|
|