| 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 4c0b55fc62a7442d370a1ee6d2d48cf30b18835e..a55f440979236424ab3f6b2dfc736f65bda5d1e3 100644
|
| --- a/chrome/test/base/testing_profile_manager.cc
|
| +++ b/chrome/test/base/testing_profile_manager.cc
|
| @@ -15,7 +15,7 @@
|
| #include "chrome/browser/profiles/profile_manager.h"
|
| #include "chrome/common/chrome_constants.h"
|
| #include "chrome/test/base/testing_browser_process.h"
|
| -#include "components/syncable_prefs/pref_service_syncable.h"
|
| +#include "components/sync_preferences/pref_service_syncable.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| #if defined(OS_CHROMEOS)
|
| @@ -60,7 +60,7 @@ bool TestingProfileManager::SetUp() {
|
|
|
| TestingProfile* TestingProfileManager::CreateTestingProfile(
|
| const std::string& profile_name,
|
| - std::unique_ptr<syncable_prefs::PrefServiceSyncable> prefs,
|
| + std::unique_ptr<sync_preferences::PrefServiceSyncable> prefs,
|
| const base::string16& user_name,
|
| int avatar_id,
|
| const std::string& supervised_user_id,
|
| @@ -115,7 +115,7 @@ TestingProfile* TestingProfileManager::CreateTestingProfile(
|
| const std::string& name) {
|
| DCHECK(called_set_up_);
|
| return CreateTestingProfile(
|
| - name, std::unique_ptr<syncable_prefs::PrefServiceSyncable>(),
|
| + name, std::unique_ptr<sync_preferences::PrefServiceSyncable>(),
|
| base::UTF8ToUTF16(name), 0, std::string(),
|
| TestingProfile::TestingFactories());
|
| }
|
|
|