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

chrome/browser/autofill/personal_data_manager_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/basictypes.h"
+#include "base/guid.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/autofill_common_test.h"
 #include "chrome/browser/autofill/autofill_profile.h"
 #include "chrome/browser/autofill/form_structure.h"
 #include "chrome/browser/autofill/personal_data_manager.h"
 #include "chrome/browser/autofill/personal_data_manager_observer.h"
 #include "chrome/browser/password_manager/encryptor.h"
 #include "chrome/browser/webdata/web_data_service_factory.h"
-#include "chrome/common/guid.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/test/mock_notification_observer.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 76 matching lines @@
   // Reload the database.
   ResetPersonalDataManager();
 
   // Verify the addition.
   const std::vector<AutofillProfile*>& results1 = personal_data_->profiles();
   ASSERT_EQ(1U, results1.size());
   EXPECT_EQ(0, profile0.Compare(*results1[0]));
 
   // Add profile with identical values.  Duplicates should not get saved.
   AutofillProfile profile0a = profile0;
-  profile0a.set_guid(guid::GenerateGUID());
+  profile0a.set_guid(base::GenerateGUID());
   personal_data_->AddProfile(profile0a);
 
   // Reload the database.
   ResetPersonalDataManager();
 
   // Verify the non-addition.
   const std::vector<AutofillProfile*>& results2 = personal_data_->profiles();
   ASSERT_EQ(1U, results2.size());
   EXPECT_EQ(0, profile0.Compare(*results2[0]));
 
   // New profile with different email.
   AutofillProfile profile1 = profile0;
-  profile1.set_guid(guid::GenerateGUID());
+  profile1.set_guid(base::GenerateGUID());
   profile1.SetInfo(EMAIL_ADDRESS, ASCIIToUTF16("john@smith.com"));
 
   // Add the different profile.  This should save as a separate profile.
   // Note that if this same profile was "merged" it would collapse to one
   // profile with a multi-valued entry for email.
   personal_data_->AddProfile(profile1);
 
   // Reload the database.
   ResetPersonalDataManager();
 
@@ skipping 207 matching lines @@
 
   // Verify that the web database has been updated and the notification sent.
   EXPECT_CALL(personal_data_observer_,
               OnPersonalDataChanged()).WillOnce(QuitUIMessageLoop());
   MessageLoop::current()->Run();
 
   // Make sure the two profiles have different GUIDs, both valid.
   const std::vector<AutofillProfile*>& results3 = personal_data_->profiles();
   ASSERT_EQ(2U, results3.size());
   EXPECT_NE(results3[0]->guid(), results3[1]->guid());
-  EXPECT_TRUE(guid::IsValidGUID(results3[0]->guid()));
-  EXPECT_TRUE(guid::IsValidGUID(results3[1]->guid()));
+  EXPECT_TRUE(base::IsValidGUID(results3[0]->guid()));
+  EXPECT_TRUE(base::IsValidGUID(results3[1]->guid()));
 }
 
 TEST_F(PersonalDataManagerTest, SetEmptyProfile) {
   AutofillProfile profile0;
   autofill_test::SetProfileInfo(&profile0,
       "", "", "", "", "", "", "", "", "", "", "", "");
 
   // Add the empty profile to the database.
   personal_data_->AddProfile(profile0);
 
@@ skipping 1583 matching lines @@
 
   // Modify expected to include multi-valued fields.
   std::vector<string16> values;
   expected.GetMultiInfo(PHONE_HOME_CITY_AND_NUMBER, &values);
   values.push_back(ASCIIToUTF16("214-555-1234"));
   expected.SetMultiInfo(PHONE_HOME_CITY_AND_NUMBER, values);
 
   ASSERT_EQ(1U, results2.size());
   EXPECT_EQ(0, expected.Compare(*results2[0]));
 }