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

chrome/browser/webdata/web_database_migration_unittest.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 <string>
 
 #include "base/file_util.h"
+#include "base/guid.h"
 #include "base/message_loop.h"
 #include "base/scoped_temp_dir.h"
 #include "base/stl_util.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.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/webdata/autofill_change.h"
 #include "chrome/browser/webdata/autofill_entry.h"
 #include "chrome/browser/webdata/keyword_table.h"
 #include "chrome/browser/webdata/web_database.h"
 #include "chrome/browser/webdata/web_intents_table.h"
 #include "chrome/common/chrome_paths.h"
-#include "chrome/common/guid.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/test/test_browser_thread.h"
 #include "sql/statement.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::Time;
 using content::BrowserThread;
 
 namespace {
 
@@ skipping 15 matching lines @@
   profile->SetInfo(COMPANY_NAME, s.ColumnString16(6));
   profile->SetInfo(ADDRESS_HOME_LINE1, s.ColumnString16(7));
   profile->SetInfo(ADDRESS_HOME_LINE2, s.ColumnString16(8));
   profile->SetInfo(ADDRESS_HOME_CITY, s.ColumnString16(9));
   profile->SetInfo(ADDRESS_HOME_STATE, s.ColumnString16(10));
   profile->SetInfo(ADDRESS_HOME_ZIP, s.ColumnString16(11));
   profile->SetInfo(ADDRESS_HOME_COUNTRY, s.ColumnString16(12));
   profile->SetInfo(PHONE_HOME_WHOLE_NUMBER, s.ColumnString16(13));
   *date_modified = s.ColumnInt64(15);
   profile->set_guid(s.ColumnString(16));
-  EXPECT_TRUE(guid::IsValidGUID(profile->guid()));
+  EXPECT_TRUE(base::IsValidGUID(profile->guid()));
 }
 
 void AutofillProfile33FromStatement(const sql::Statement& s,
                                     AutofillProfile* profile,
                                     int64* date_modified) {
   DCHECK(profile);
   DCHECK(date_modified);
   profile->set_guid(s.ColumnString(0));
-  EXPECT_TRUE(guid::IsValidGUID(profile->guid()));
+  EXPECT_TRUE(base::IsValidGUID(profile->guid()));
   profile->SetInfo(COMPANY_NAME, s.ColumnString16(1));
   profile->SetInfo(ADDRESS_HOME_LINE1, s.ColumnString16(2));
   profile->SetInfo(ADDRESS_HOME_LINE2, s.ColumnString16(3));
   profile->SetInfo(ADDRESS_HOME_CITY, s.ColumnString16(4));
   profile->SetInfo(ADDRESS_HOME_STATE, s.ColumnString16(5));
   profile->SetInfo(ADDRESS_HOME_ZIP, s.ColumnString16(6));
   profile->SetInfo(ADDRESS_HOME_COUNTRY, s.ColumnString16(7));
   *date_modified = s.ColumnInt64(8);
 }
 
@@ skipping 14 matching lines @@
   credit_card->SetInfo(CREDIT_CARD_TYPE, s.ColumnString16(3));
   credit_card->SetInfo(CREDIT_CARD_EXP_MONTH, s.ColumnString16(5));
   credit_card->SetInfo(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,
                                std::string* encrypted_number,
                                int64* date_modified) {
   DCHECK(credit_card);
   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()));
   credit_card->SetInfo(CREDIT_CARD_NAME, s.ColumnString16(1));
   credit_card->SetInfo(CREDIT_CARD_EXP_MONTH, s.ColumnString16(2));
   credit_card->SetInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR, s.ColumnString16(3));
   int encrypted_number_len = s.ColumnByteLength(4);
   if (encrypted_number_len) {
     encrypted_number->resize(encrypted_number_len);
     memcpy(&(*encrypted_number)[0], s.ColumnBlob(4), encrypted_number_len);
   }
   *date_modified = s.ColumnInt64(5);
 }
@@ skipping 559 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(LoadDatabase(FILE_PATH_LITERAL("version_31.sql")));
@@ skipping 1453 matching lines @@
 
     // We were able to create the new tables, but unable to copy any data
     // Given the initial bad state of the tables.
     ASSERT_FALSE(s2.Step());
 
     // Finally ensure the migration code cleaned up after itself.
     EXPECT_FALSE(connection.DoesTableExist("old_web_intents"));
     EXPECT_FALSE(connection.DoesTableExist("old_web_intents_defaults"));
   }
 }