| Index: chrome/test/base/testing_profile_manager.cc
|
| diff --git a/chrome/test/base/testing_profile_manager.cc b/chrome/test/base/testing_profile_manager.cc
|
| index 01ffd6b7242e54b062ac7fb013b224d4d1583f13..d96c5ebdc5cbd61609fa64a7584d9eb900cd2112 100644
|
| --- a/chrome/test/base/testing_profile_manager.cc
|
| +++ b/chrome/test/base/testing_profile_manager.cc
|
| @@ -48,7 +48,7 @@ bool TestingProfileManager::SetUp() {
|
| TestingProfile* TestingProfileManager::CreateTestingProfile(
|
| const std::string& profile_name,
|
| scoped_ptr<PrefServiceSyncable> prefs,
|
| - const string16& user_name,
|
| + const base::string16& user_name,
|
| int avatar_id,
|
| const std::string& managed_user_id,
|
| const TestingProfile::TestingFactories& factories) {
|
|
|