Index: chrome/browser/webdata/web_database.cc |
diff --git a/chrome/browser/webdata/web_database.cc b/chrome/browser/webdata/web_database.cc |
index 12293390bcb82b8b4595847e0b27617ef17070ea..6f81b6f3ab2ab8a1b4f2ea6d956049285d16586b 100644 |
--- a/chrome/browser/webdata/web_database.cc |
+++ b/chrome/browser/webdata/web_database.cc |
@@ -12,6 +12,7 @@ |
#include "app/l10n_util.h" |
#include "app/sql/statement.h" |
#include "app/sql/transaction.h" |
+#include "base/guid.h" |
#include "base/string_number_conversions.h" |
#include "base/string_split.h" |
#include "base/string_util.h" |
@@ -21,7 +22,6 @@ |
#include "chrome/browser/autofill/autofill_type.h" |
#include "chrome/browser/autofill/credit_card.h" |
#include "chrome/browser/diagnostics/sqlite_diagnostics.h" |
-#include "chrome/browser/guid.h" |
#include "chrome/browser/history/history_database.h" |
#include "chrome/browser/password_manager/encryptor.h" |
#include "chrome/browser/search_engines/template_url.h" |
@@ -255,7 +255,7 @@ string16 LimitDataSize(const string16& data) { |
void BindAutoFillProfileToStatement(const AutoFillProfile& profile, |
sql::Statement* s) { |
- DCHECK(guid::IsValidGUID(profile.guid())); |
+ DCHECK(base::IsValidGUID(profile.guid())); |
s->BindString(0, profile.guid()); |
s->BindString16(1, profile.Label()); |
@@ -291,7 +291,7 @@ void BindAutoFillProfileToStatement(const AutoFillProfile& profile, |
AutoFillProfile* AutoFillProfileFromStatement(const sql::Statement& s) { |
AutoFillProfile* profile = new AutoFillProfile; |
profile->set_guid(s.ColumnString(0)); |
- DCHECK(guid::IsValidGUID(profile->guid())); |
+ DCHECK(base::IsValidGUID(profile->guid())); |
profile->set_label(s.ColumnString16(1)); |
profile->SetInfo(AutoFillType(NAME_FIRST), |
@@ -327,7 +327,7 @@ AutoFillProfile* AutoFillProfileFromStatement(const sql::Statement& s) { |
void BindCreditCardToStatement(const CreditCard& credit_card, |
sql::Statement* s) { |
- DCHECK(guid::IsValidGUID(credit_card.guid())); |
+ DCHECK(base::IsValidGUID(credit_card.guid())); |
s->BindString(0, credit_card.guid()); |
s->BindString16(1, credit_card.Label()); |
@@ -349,7 +349,7 @@ CreditCard* CreditCardFromStatement(const sql::Statement& s) { |
CreditCard* credit_card = new CreditCard; |
credit_card->set_guid(s.ColumnString(0)); |
- DCHECK(guid::IsValidGUID(credit_card->guid())); |
+ DCHECK(base::IsValidGUID(credit_card->guid())); |
credit_card->set_label(s.ColumnString16(1)); |
credit_card->SetInfo(AutoFillType(CREDIT_CARD_NAME), |
@@ -1648,7 +1648,7 @@ bool WebDatabase::GetAutoFillProfileForLabel(const string16& label, |
bool WebDatabase::GetAutoFillProfileForGUID(const std::string& guid, |
AutoFillProfile** profile) { |
- DCHECK(guid::IsValidGUID(guid)); |
+ DCHECK(base::IsValidGUID(guid)); |
DCHECK(profile); |
sql::Statement s(db_.GetUniqueStatement( |
"SELECT guid, label, first_name, middle_name, last_name, email, " |
@@ -1692,7 +1692,7 @@ bool WebDatabase::GetAutoFillProfiles( |
} |
bool WebDatabase::UpdateAutoFillProfile(const AutoFillProfile& profile) { |
- DCHECK(guid::IsValidGUID(profile.guid())); |
+ DCHECK(base::IsValidGUID(profile.guid())); |
AutoFillProfile* tmp_profile = NULL; |
if (!GetAutoFillProfileForGUID(profile.guid(), &tmp_profile)) |
@@ -1723,7 +1723,7 @@ bool WebDatabase::UpdateAutoFillProfile(const AutoFillProfile& profile) { |
} |
bool WebDatabase::RemoveAutoFillProfile(const std::string& guid) { |
- DCHECK(guid::IsValidGUID(guid)); |
+ DCHECK(base::IsValidGUID(guid)); |
sql::Statement s(db_.GetUniqueStatement( |
"DELETE FROM autofill_profiles WHERE guid = ?")); |
if (!s) { |
@@ -1781,7 +1781,7 @@ bool WebDatabase::GetCreditCardForLabel(const string16& label, |
bool WebDatabase::GetCreditCardForGUID(const std::string& guid, |
CreditCard** credit_card) { |
- DCHECK(guid::IsValidGUID(guid)); |
+ DCHECK(base::IsValidGUID(guid)); |
sql::Statement s(db_.GetUniqueStatement( |
"SELECT guid, label, name_on_card, expiration_month, expiration_year, " |
"card_number_encrypted, date_modified " |
@@ -1822,7 +1822,7 @@ bool WebDatabase::GetCreditCards( |
} |
bool WebDatabase::UpdateCreditCard(const CreditCard& credit_card) { |
- DCHECK(guid::IsValidGUID(credit_card.guid())); |
+ DCHECK(base::IsValidGUID(credit_card.guid())); |
CreditCard* tmp_credit_card = NULL; |
if (!GetCreditCardForGUID(credit_card.guid(), &tmp_credit_card)) |
@@ -1851,7 +1851,7 @@ bool WebDatabase::UpdateCreditCard(const CreditCard& credit_card) { |
} |
bool WebDatabase::RemoveCreditCard(const std::string& guid) { |
- DCHECK(guid::IsValidGUID(guid)); |
+ DCHECK(base::IsValidGUID(guid)); |
sql::Statement s(db_.GetUniqueStatement( |
"DELETE FROM credit_cards WHERE guid = ?")); |
if (!s) { |
@@ -2421,7 +2421,7 @@ sql::InitStatus WebDatabase::MigrateOldVersionsAsNeeded(){ |
NOTREACHED(); |
return sql::INIT_FAILURE; |
} |
- update_s.BindString(0, guid::GenerateGUID()); |
+ update_s.BindString(0, base::GenerateGUID()); |
update_s.BindInt(1, s.ColumnInt(0)); |
if (!update_s.Run()) { |
@@ -2464,7 +2464,7 @@ sql::InitStatus WebDatabase::MigrateOldVersionsAsNeeded(){ |
NOTREACHED(); |
return sql::INIT_FAILURE; |
} |
- update_s.BindString(0, guid::GenerateGUID()); |
+ update_s.BindString(0, base::GenerateGUID()); |
update_s.BindInt(1, s.ColumnInt(0)); |
if (!update_s.Run()) { |