Move guid generation from chrome/common/ to base/.

chrome/browser/ui/webui/options2/autofill_options_handler2.cc

 // Copyright (c) 2012 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/ui/webui/options2/autofill_options_handler2.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
+#include "base/guid.h"
 #include "base/logging.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/autofill/autofill_country.h"
 #include "chrome/browser/autofill/autofill_profile.h"
 #include "chrome/browser/autofill/credit_card.h"
 #include "chrome/browser/autofill/personal_data_manager.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
 #include "chrome/browser/autofill/phone_number_i18n.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/web_ui_util.h"
-#include "chrome/common/guid.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/generated_resources.h"
 #include "grit/webkit_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
 
 // Converts a credit card type to the appropriate resource ID of the CC icon.
 int CreditCardTypeToResourceID(const std::string& type) {
@@ skipping 530 matching lines @@
     profile.SetInfo(ADDRESS_HOME_STATE, value);
   if (args->GetString(7, &value))
     profile.SetInfo(ADDRESS_HOME_ZIP, value);
   if (args->GetString(8, &country_code))
     profile.SetCountryCode(country_code);
   if (args->GetList(9, &list_value))
     SetValueList(list_value, PHONE_HOME_WHOLE_NUMBER, &profile);
   if (args->GetList(10, &list_value))
     SetValueList(list_value, EMAIL_ADDRESS, &profile);
 
-  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::SetCreditCard(const ListValue* args) {
   if (!IsPersonalDataLoaded())
     return;
 
   std::string guid;
   if (!args->GetString(0, &guid)) {
     NOTREACHED();
     return;
   }
 
   CreditCard credit_card(guid);
 
   string16 value;
   if (args->GetString(1, &value))
     credit_card.SetInfo(CREDIT_CARD_NAME, value);
   if (args->GetString(2, &value))
     credit_card.SetInfo(CREDIT_CARD_NUMBER, value);
   if (args->GetString(3, &value))
     credit_card.SetInfo(CREDIT_CARD_EXP_MONTH, value);
   if (args->GetString(4, &value))
     credit_card.SetInfo(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::ValidatePhoneNumbers(const ListValue* args) {
   if (!IsPersonalDataLoaded())
     return;
 
   ListValue* list_value = NULL;
   ValidatePhoneArguments(args, &list_value);
 
   web_ui()->CallJavascriptFunction(
     "AutofillEditAddressOverlay.setValidatedPhoneNumbers", *list_value);
 }
 
 bool AutofillOptionsHandler::IsPersonalDataLoaded() const {
   return personal_data_ && personal_data_->IsDataLoaded();
 }
 
 }  // namespace options2