Move GUID utils to src/chrome/common.

chrome/browser/webdata/web_database.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/webdata/web_database.h"
 
 #include <algorithm>
 #include <limits>
 #include <set>
 #include <string>
 
 #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"
 #include "base/tuple.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/autofill_profile.h"
 #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"
 #include "chrome/browser/webdata/autofill_change.h"
 #include "chrome/common/notification_service.h"
 #include "gfx/codec/png_codec.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "webkit/glue/form_field.h"
 #include "webkit/glue/password_form.h"
 
@@ skipping 213 matching lines @@
 // See http://crbug.com/49332.
 string16 LimitDataSize(const string16& data) {
   if (data.size() > kMaxDataLength)
     return data.substr(0, kMaxDataLength);
 
   return 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());
 
   string16 text = profile.GetFieldText(AutoFillType(NAME_FIRST));
   s->BindString16(2, LimitDataSize(text));
   text = profile.GetFieldText(AutoFillType(NAME_MIDDLE));
   s->BindString16(3, LimitDataSize(text));
   text = profile.GetFieldText(AutoFillType(NAME_LAST));
   s->BindString16(4, LimitDataSize(text));
   text = profile.GetFieldText(AutoFillType(EMAIL_ADDRESS));
@@ skipping 15 matching lines @@
   text = profile.GetFieldText(AutoFillType(PHONE_HOME_WHOLE_NUMBER));
   s->BindString16(13, LimitDataSize(text));
   text = profile.GetFieldText(AutoFillType(PHONE_FAX_WHOLE_NUMBER));
   s->BindString16(14, LimitDataSize(text));
   s->BindInt64(15, Time::Now().ToTimeT());
 }
 
 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),
                    s.ColumnString16(2));
   profile->SetInfo(AutoFillType(NAME_MIDDLE),
                    s.ColumnString16(3));
   profile->SetInfo(AutoFillType(NAME_LAST),
                    s.ColumnString16(4));
   profile->SetInfo(AutoFillType(EMAIL_ADDRESS),
                    s.ColumnString16(5));
@@ skipping 15 matching lines @@
                    s.ColumnString16(13));
   profile->SetInfo(AutoFillType(PHONE_FAX_WHOLE_NUMBER),
                    s.ColumnString16(14));
   // Intentionally skip column 15, which stores the profile's modification date.
 
   return profile;
 }
 
 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());
 
   string16 text = credit_card.GetFieldText(AutoFillType(CREDIT_CARD_NAME));
   s->BindString16(2, LimitDataSize(text));
   text = credit_card.GetFieldText(AutoFillType(CREDIT_CARD_EXP_MONTH));
   s->BindString16(3, LimitDataSize(text));
   text = credit_card.GetFieldText(AutoFillType(CREDIT_CARD_EXP_4_DIGIT_YEAR));
   s->BindString16(4, LimitDataSize(text));
   text = credit_card.GetFieldText(AutoFillType(CREDIT_CARD_NUMBER));
   std::string encrypted_data;
   Encryptor::EncryptString16(text, &encrypted_data);
   s->BindBlob(5, encrypted_data.data(),
               static_cast<int>(encrypted_data.length()));
   s->BindInt64(6, Time::Now().ToTimeT());
 }
 
 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),
                        s.ColumnString16(2));
   credit_card->SetInfo(AutoFillType(CREDIT_CARD_EXP_MONTH),
                        s.ColumnString16(3));
   credit_card->SetInfo(AutoFillType(CREDIT_CARD_EXP_4_DIGIT_YEAR),
                        s.ColumnString16(4));
   int encrypted_number_len = s.ColumnByteLength(5);
   string16 credit_card_number;
@@ skipping 1278 matching lines @@
   if (!s.Step())
     return false;
 
   *profile = AutoFillProfileFromStatement(s);
 
   return s.Succeeded();
 }
 
 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, "
       "company_name, address_line_1, address_line_2, city, state, zipcode, "
       "country, phone, fax, date_modified "
       "FROM autofill_profiles "
       "WHERE guid = ?"));
   if (!s) {
     NOTREACHED() << "Statement prepare failed";
     return false;
@@ skipping 23 matching lines @@
     return false;
   }
 
   while (s.Step())
     profiles->push_back(AutoFillProfileFromStatement(s));
 
   return s.Succeeded();
 }
 
 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))
     return false;
 
   // Preserve appropriate modification dates by not updating unchanged profiles.
   scoped_ptr<AutoFillProfile> old_profile(tmp_profile);
   if (*old_profile == profile)
     return true;
 
@@ skipping 10 matching lines @@
   }
 
   BindAutoFillProfileToStatement(profile, &s);
   s.BindString(16, profile.guid());
   bool result = s.Run();
   DCHECK_GT(db_.GetLastChangeCount(), 0);
   return result;
 }
 
 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) {
     NOTREACHED() << "Statement prepare failed";
     return false;
   }
 
   s.BindString(0, guid);
   return s.Run();
 }
@@ skipping 37 matching lines @@
   if (!s.Step())
     return false;
 
   *credit_card = CreditCardFromStatement(s);
 
   return s.Succeeded();
 }
 
 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 "
       "FROM credit_cards "
       "WHERE guid = ?"));
   if (!s) {
     NOTREACHED() << "Statement prepare failed";
     return false;
   }
 
@@ skipping 20 matching lines @@
     return false;
   }
 
   while (s.Step())
     credit_cards->push_back(CreditCardFromStatement(s));
 
   return s.Succeeded();
 }
 
 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))
     return false;
 
   // Preserve appropriate modification dates by not updating unchanged cards.
   scoped_ptr<CreditCard> old_credit_card(tmp_credit_card);
   if (*old_credit_card == credit_card)
     return true;
 
   sql::Statement s(db_.GetUniqueStatement(
       "UPDATE credit_cards "
       "SET guid=?, label=?, name_on_card=?, expiration_month=?, "
       "    expiration_year=?, card_number_encrypted=?, date_modified=? "
       "WHERE guid=?"));
   if (!s) {
     NOTREACHED() << "Statement prepare failed";
     return false;
   }
 
   BindCreditCardToStatement(credit_card, &s);
   s.BindString(7, credit_card.guid());
   bool result = s.Run();
   DCHECK_GT(db_.GetLastChangeCount(), 0);
   return result;
 }
 
 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) {
     NOTREACHED() << "Statement prepare failed";
     return false;
   }
 
   s.BindString(0, guid);
   return s.Run();
 }
@@ skipping 549 matching lines @@
 
           while (s.Step()) {
             sql::Statement update_s(
                 db_.GetUniqueStatement("UPDATE autofill_profiles "
                                        "SET guid=? WHERE unique_id=?"));
             if (!update_s) {
               LOG(WARNING) << "Unable to update web database to version 30.";
               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()) {
               LOG(WARNING) << "Unable to update web database to version 30.";
               NOTREACHED();
               return sql::INIT_FAILURE;
             }
           }
         }
       }
@@ skipping 22 matching lines @@
 
           while (s.Step()) {
             sql::Statement update_s(
                 db_.GetUniqueStatement("UPDATE credit_cards "
                                        "set guid=? WHERE unique_id=?"));
             if (!update_s) {
               LOG(WARNING) << "Unable to update web database to version 30.";
               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()) {
               LOG(WARNING) << "Unable to update web database to version 30.";
               NOTREACHED();
               return sql::INIT_FAILURE;
             }
           }
         }
       }
@@ skipping 99 matching lines @@
 
     // Add successive versions here.  Each should set the version number and
     // compatible version number as appropriate, then fall through to the next
     // case.
 
     case kCurrentVersionNumber:
       // No migration needed.
       return sql::INIT_OK;
   }
 }