Move GUID utils to src/chrome/common.

chrome/browser/webdata/web_database_unittest.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 <list>
 #include <map>
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "app/sql/statement.h"
+#include "base/guid.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
 #include "base/stl_util-inl.h"
 #include "base/string_number_conversions.h"
 #include "base/string16.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.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/guid.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/password_manager/encryptor.h"
 #include "chrome/browser/webdata/autofill_change.h"
 #include "chrome/browser/webdata/autofill_entry.h"
 #include "chrome/browser/webdata/web_database.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/ui_test_utils.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/glue/form_field.h"
@@ skipping 77 matching lines @@
   profile->SetInfo(AutoFillType(ADDRESS_HOME_LINE1), s.ColumnString16(7));
   profile->SetInfo(AutoFillType(ADDRESS_HOME_LINE2), s.ColumnString16(8));
   profile->SetInfo(AutoFillType(ADDRESS_HOME_CITY), s.ColumnString16(9));
   profile->SetInfo(AutoFillType(ADDRESS_HOME_STATE), s.ColumnString16(10));
   profile->SetInfo(AutoFillType(ADDRESS_HOME_ZIP), s.ColumnString16(11));
   profile->SetInfo(AutoFillType(ADDRESS_HOME_COUNTRY), s.ColumnString16(12));
   profile->SetInfo(AutoFillType(PHONE_HOME_WHOLE_NUMBER), s.ColumnString16(13));
   profile->SetInfo(AutoFillType(PHONE_FAX_WHOLE_NUMBER), s.ColumnString16(14));
   *date_modified = s.ColumnInt64(15);
   profile->set_guid(s.ColumnString(16));
-  EXPECT_TRUE(guid::IsValidGUID(profile->guid()));
+  EXPECT_TRUE(base::IsValidGUID(profile->guid()));
 }
 
 void AutoFillProfile32FromStatement(const sql::Statement& s,
                                     AutoFillProfile* profile,
                                     string16* label,
                                     int64* date_modified) {
   DCHECK(profile);
   DCHECK(label);
   DCHECK(date_modified);
   profile->set_guid(s.ColumnString(0));
-  EXPECT_TRUE(guid::IsValidGUID(profile->guid()));
+  EXPECT_TRUE(base::IsValidGUID(profile->guid()));
   *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));
   profile->SetInfo(AutoFillType(COMPANY_NAME), s.ColumnString16(6));
   profile->SetInfo(AutoFillType(ADDRESS_HOME_LINE1), s.ColumnString16(7));
   profile->SetInfo(AutoFillType(ADDRESS_HOME_LINE2), s.ColumnString16(8));
   profile->SetInfo(AutoFillType(ADDRESS_HOME_CITY), s.ColumnString16(9));
   profile->SetInfo(AutoFillType(ADDRESS_HOME_STATE), s.ColumnString16(10));
@@ skipping 23 matching lines @@
                        s.ColumnString16(5));
   credit_card->SetInfo(AutoFillType(CREDIT_CARD_EXP_4_DIGIT_YEAR),
                        s.ColumnString16(6));
   int encrypted_number_len = s.ColumnByteLength(10);
   if (encrypted_number_len) {
     encrypted_number->resize(encrypted_number_len);
     memcpy(&(*encrypted_number)[0], s.ColumnBlob(10), encrypted_number_len);
   }
   *date_modified = s.ColumnInt64(12);
   credit_card->set_guid(s.ColumnString(13));
-  EXPECT_TRUE(guid::IsValidGUID(credit_card->guid()));
+  EXPECT_TRUE(base::IsValidGUID(credit_card->guid()));
 }
 
 void CreditCard32FromStatement(const sql::Statement& s,
                                CreditCard* credit_card,
                                string16* label,
                                std::string* encrypted_number,
                                int64* date_modified) {
   DCHECK(credit_card);
   DCHECK(label);
   DCHECK(encrypted_number);
   DCHECK(date_modified);
   credit_card->set_guid(s.ColumnString(0));
-  EXPECT_TRUE(guid::IsValidGUID(credit_card->guid()));
+  EXPECT_TRUE(base::IsValidGUID(credit_card->guid()));
   *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);
   if (encrypted_number_len) {
     encrypted_number->resize(encrypted_number_len);
     memcpy(&(*encrypted_number)[0], s.ColumnBlob(5), encrypted_number_len);
@@ skipping 1231 matching lines @@
   EXPECT_FALSE(s_home.Step());
   delete db_profile;
 
   // Add a 'Billing' profile.
   AutoFillProfile billing_profile = home_profile;
   billing_profile.set_label(ASCIIToUTF16("Billing"));
   billing_profile.SetInfo(AutoFillType(ADDRESS_HOME_LINE1),
                           ASCIIToUTF16("5678 Bottom Street"));
   billing_profile.SetInfo(AutoFillType(ADDRESS_HOME_LINE2),
                           ASCIIToUTF16("suite 3"));
-  billing_profile.set_guid(guid::GenerateGUID());
+  billing_profile.set_guid(base::GenerateGUID());
 
   pre_creation_time = Time::Now();
   EXPECT_TRUE(db.AddAutoFillProfile(billing_profile));
   post_creation_time = Time::Now();
 
   // Get the 'Billing' profile.
   ASSERT_TRUE(db.GetAutoFillProfileForLabel(ASCIIToUTF16("Billing"),
                                             &db_profile));
   EXPECT_EQ(billing_profile, *db_profile);
   sql::Statement s_billing(db.db_.GetUniqueStatement(
@@ skipping 29 matching lines @@
   EXPECT_FALSE(db.GetAutoFillProfileForLabel(ASCIIToUTF16("Billing"),
                                              &db_profile));
 
   // Add a 'GUID' profile.
   AutoFillProfile guid_profile = home_profile;
   guid_profile.set_label(ASCIIToUTF16("GUID"));
   guid_profile.SetInfo(AutoFillType(ADDRESS_HOME_LINE1),
                        ASCIIToUTF16("5678 Top Street"));
   guid_profile.SetInfo(AutoFillType(ADDRESS_HOME_LINE2),
                        ASCIIToUTF16("suite 4"));
-  guid_profile.set_guid(guid::GenerateGUID());
+  guid_profile.set_guid(base::GenerateGUID());
 
   EXPECT_TRUE(db.AddAutoFillProfile(guid_profile));
   ASSERT_TRUE(db.GetAutoFillProfileForGUID(guid_profile.guid(),
                                            &db_profile));
   EXPECT_EQ(guid_profile, *db_profile);
   delete db_profile;
 
   // Update the 'GUID' profile.
   guid_profile.SetInfo(AutoFillType(NAME_FIRST), ASCIIToUTF16("Jimmy"));
   EXPECT_TRUE(db.UpdateAutoFillProfile(guid_profile));
@@ skipping 1181 matching lines @@
     ASSERT_TRUE(connection.DoesColumnExist("autofill_profiles", "guid"));
     ASSERT_TRUE(connection.DoesColumnExist("credit_cards", "guid"));
 
     // Check that guids are non-null, non-empty, conforms to guid format, and
     // are different.
     sql::Statement s(
         connection.GetUniqueStatement("SELECT guid FROM autofill_profiles"));
 
     ASSERT_TRUE(s.Step());
     std::string guid1 = s.ColumnString(0);
-    EXPECT_TRUE(guid::IsValidGUID(guid1));
+    EXPECT_TRUE(base::IsValidGUID(guid1));
 
     ASSERT_TRUE(s.Step());
     std::string guid2 = s.ColumnString(0);
-    EXPECT_TRUE(guid::IsValidGUID(guid2));
+    EXPECT_TRUE(base::IsValidGUID(guid2));
 
     EXPECT_NE(guid1, guid2);
   }
 }
 
 // Removes unique IDs and make GUIDs the primary key.  Also removes unused
 // columns.
 TEST_F(WebDatabaseMigrationTest, MigrateVersion31ToCurrent) {
   // Initialize the database.
   ASSERT_NO_FATAL_FAILURE(
@@ skipping 123 matching lines @@
                                                       &credit_card_a,
                                                       &cc_label_a,
                                                       &cc_number_encrypted_a,
                                                       &cc_date_modified_a));
     EXPECT_EQ(credit_card, credit_card_a);
     EXPECT_EQ(cc_label, cc_label_a);
     EXPECT_EQ(cc_number_encrypted, cc_number_encrypted_a);
     EXPECT_EQ(cc_date_modified, cc_date_modified_a);
   }
 }