Move GUID utils to src/chrome/common.

chrome/browser/dom_ui/options/autofill_options_handler.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/dom_ui/options/autofill_options_handler.h"
 
 #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"
 
 AutoFillOptionsHandler::AutoFillOptionsHandler()
     : personal_data_(NULL) {
 }
 
 AutoFillOptionsHandler::~AutoFillOptionsHandler() {
   if (personal_data_)
     personal_data_->RemoveObserver(this);
@@ skipping 182 matching lines @@
     profile.SetInfo(AutoFillType(ADDRESS_HOME_ZIP), value);
   if (args->GetString(8, &value))
     profile.SetInfo(AutoFillType(ADDRESS_HOME_COUNTRY), value);
   if (args->GetString(9, &value))
     profile.SetInfo(AutoFillType(PHONE_HOME_WHOLE_NUMBER), value);
   if (args->GetString(10, &value))
     profile.SetInfo(AutoFillType(PHONE_FAX_WHOLE_NUMBER), value);
   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);
   }
 }
 
 void AutoFillOptionsHandler::EditAddress(const ListValue* args) {
   if (!personal_data_->IsDataLoaded())
     return;
 
@@ skipping 72 matching lines @@
   string16 value;
   if (args->GetString(1, &value))
     credit_card.SetInfo(AutoFillType(CREDIT_CARD_NAME), value);
   if (args->GetString(2, &value))
     credit_card.SetInfo(AutoFillType(CREDIT_CARD_NUMBER), value);
   if (args->GetString(3, &value))
     credit_card.SetInfo(AutoFillType(CREDIT_CARD_EXP_MONTH), value);
   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);
   }
 
 }
 
 void AutoFillOptionsHandler::EditCreditCard(const ListValue* args) {
   if (!personal_data_->IsDataLoaded())
       return;
@@ skipping 39 matching lines @@
     return;
 
   std::string guid;
   if (!args->GetString(0, &guid)) {
     NOTREACHED();
     return;
   }
 
   personal_data_->RemoveCreditCard(guid);
 }