Move GUID utils to src/chrome/common.

chrome/browser/autofill/autofill_manager.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/autofill/autofill_manager.h"
 
 #include <limits>
 #include <string>
 
 #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"
 #include "chrome/browser/autofill/autofill_dialog.h"
 #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"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "grit/generated_resources.h"
 #include "webkit/glue/form_data.h"
 #include "webkit/glue/form_field.h"
@@ skipping 247 matching lines @@
     return false;
 
   DCHECK(host);
   DCHECK(form_structure);
   DCHECK(autofill_field);
 
   // Unpack the |unique_id| into component parts.
   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) {
         profile = *iter;
         break;
       }
     }
     DCHECK(profile);
   }
 
   // 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) {
         credit_card = *iter;
         break;
       }
     }
     DCHECK(credit_card);
   }
 
@@ skipping 428 matching lines @@
       std::numeric_limits<unsigned short>::max();
   int profile_id = id & std::numeric_limits<unsigned short>::max();
 
   *cc_guid = IDToGUID(cc_id);
   *profile_guid = IDToGUID(profile_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);
   if (iter == guid_id_map_.end()) {
     guid_id_map_[guid] = last_id;
     id_guid_map_[last_id] = guid;
     return last_id++;
   } else {
     return iter->second;
   }
 }
 
 const std::string AutoFillManager::IDToGUID(int id) {
   if (id == 0)
     return std::string();
 
   std::map<int, std::string>::const_iterator iter = id_guid_map_.find(id);
   if (iter == id_guid_map_.end()) {
     NOTREACHED();
     return std::string();
   }
 
   return iter->second;
 }