| Index: chrome/browser/autofill/personal_data_manager_unittest.cc
|
| diff --git a/chrome/browser/autofill/personal_data_manager_unittest.cc b/chrome/browser/autofill/personal_data_manager_unittest.cc
|
| index 73700d359a6c3413daa351e07c7dc834e69d06e6..01daccaeb87b4d175565b86255ae7964e77748b4 100644
|
| --- a/chrome/browser/autofill/personal_data_manager_unittest.cc
|
| +++ b/chrome/browser/autofill/personal_data_manager_unittest.cc
|
| @@ -5,6 +5,7 @@
|
| #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"
|
| @@ -15,7 +16,6 @@
|
| #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"
|
| @@ -112,7 +112,7 @@ TEST_F(PersonalDataManagerTest, AddProfile) {
|
|
|
| // 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.
|
| @@ -125,7 +125,7 @@ TEST_F(PersonalDataManagerTest, AddProfile) {
|
|
|
| // 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.
|
| @@ -353,8 +353,8 @@ TEST_F(PersonalDataManagerTest, PopulateUniqueIDsOnLoad) {
|
| 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) {
|
|
|