| Index: chrome/browser/dom_ui/options/autofill_options_handler.cc
|
| diff --git a/chrome/browser/dom_ui/options/autofill_options_handler.cc b/chrome/browser/dom_ui/options/autofill_options_handler.cc
|
| index adc1804c68ecf4b6732c29f2eae1d96196475f91..ec2a9a37b99b4e884b636f0fafb6134fcabf9bf3 100644
|
| --- a/chrome/browser/dom_ui/options/autofill_options_handler.cc
|
| +++ b/chrome/browser/dom_ui/options/autofill_options_handler.cc
|
| @@ -7,13 +7,13 @@
|
| #include <vector>
|
|
|
| #include "app/l10n_util.h"
|
| +#include "base/guid.h"
|
| #include "base/logging.h"
|
| #include "base/string16.h"
|
| #include "base/string_number_conversions.h"
|
| #include "base/values.h"
|
| #include "chrome/browser/autofill/autofill_profile.h"
|
| #include "chrome/browser/autofill/credit_card.h"
|
| -#include "chrome/browser/guid.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "grit/generated_resources.h"
|
|
|
| @@ -216,8 +216,8 @@ void AutoFillOptionsHandler::UpdateAddress(const ListValue* args) {
|
| if (args->GetString(11, &value))
|
| profile.SetInfo(AutoFillType(EMAIL_ADDRESS), value);
|
|
|
| - if (!guid::IsValidGUID(profile.guid())) {
|
| - profile.set_guid(guid::GenerateGUID());
|
| + if (!base::IsValidGUID(profile.guid())) {
|
| + profile.set_guid(base::GenerateGUID());
|
| personal_data_->AddProfile(profile);
|
| } else {
|
| personal_data_->UpdateProfile(profile);
|
| @@ -310,8 +310,8 @@ void AutoFillOptionsHandler::UpdateCreditCard(const ListValue* args) {
|
| if (args->GetString(4, &value))
|
| credit_card.SetInfo(AutoFillType(CREDIT_CARD_EXP_4_DIGIT_YEAR), value);
|
|
|
| - if (!guid::IsValidGUID(credit_card.guid())) {
|
| - credit_card.set_guid(guid::GenerateGUID());
|
| + if (!base::IsValidGUID(credit_card.guid())) {
|
| + credit_card.set_guid(base::GenerateGUID());
|
| personal_data_->AddCreditCard(credit_card);
|
| } else {
|
| personal_data_->UpdateCreditCard(credit_card);
|
|
|