Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(21)

Unified Diff: chrome/browser/autofill/autofill_manager.cc

Issue 5849001: Move GUID utils to src/chrome/common. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: - Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/autofill/autofill_manager.cc
diff --git a/chrome/browser/autofill/autofill_manager.cc b/chrome/browser/autofill/autofill_manager.cc
index 1fd4a3ad86a913c6645937634c0aeaabb350b584..6685478104d94c8b58a360c4dbb89dfeddda1802 100644
--- a/chrome/browser/autofill/autofill_manager.cc
+++ b/chrome/browser/autofill/autofill_manager.cc
@@ -9,6 +9,7 @@
#include "app/l10n_util.h"
#include "base/basictypes.h"
+#include "base/guid.h"
#include "base/string16.h"
#include "base/utf_string_conversions.h"
#include "chrome/browser/autofill/autofill_cc_infobar_delegate.h"
@@ -16,7 +17,6 @@
#include "chrome/browser/autofill/form_structure.h"
#include "chrome/browser/autofill/phone_number.h"
#include "chrome/browser/autofill/select_control_handler.h"
-#include "chrome/browser/guid.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/renderer_host/render_view_host.h"
@@ -284,11 +284,11 @@ bool AutoFillManager::FillAutoFillFormData(int query_id,
std::string cc_guid;
std::string profile_guid;
UnpackGUIDs(unique_id, &cc_guid, &profile_guid);
- DCHECK(!guid::IsValidGUID(cc_guid) || !guid::IsValidGUID(profile_guid));
+ DCHECK(!base::IsValidGUID(cc_guid) || !base::IsValidGUID(profile_guid));
// Find the profile that matches the |profile_id|, if one is specified.
const AutoFillProfile* profile = NULL;
- if (guid::IsValidGUID(profile_guid)) {
+ if (base::IsValidGUID(profile_guid)) {
for (std::vector<AutoFillProfile*>::const_iterator iter = profiles.begin();
iter != profiles.end(); ++iter) {
if ((*iter)->guid() == profile_guid) {
@@ -301,7 +301,7 @@ bool AutoFillManager::FillAutoFillFormData(int query_id,
// Find the credit card that matches the |cc_id|, if one is specified.
const CreditCard* credit_card = NULL;
- if (guid::IsValidGUID(cc_guid)) {
+ if (base::IsValidGUID(cc_guid)) {
for (std::vector<CreditCard*>::const_iterator iter = credit_cards.begin();
iter != credit_cards.end(); ++iter) {
if ((*iter)->guid() == cc_guid) {
@@ -750,7 +750,7 @@ void AutoFillManager::UnpackGUIDs(int id,
int AutoFillManager::GUIDToID(const std::string& guid) {
static int last_id = 1;
- if (!guid::IsValidGUID(guid))
+ if (!base::IsValidGUID(guid))
return 0;
std::map<std::string, int>::const_iterator iter = guid_id_map_.find(guid);
« base/guid.h ('K') | « base/guid_win.cc ('k') | chrome/browser/autofill/autofill_profile.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698