| Index: chrome/browser/chromeos/preferences_chromeos_browsertest.cc
|
| diff --git a/chrome/browser/chromeos/preferences_chromeos_browsertest.cc b/chrome/browser/chromeos/preferences_chromeos_browsertest.cc
|
| index fe2654de0fbe1243b07ed08819a90572dcd30cfa..0ddfaf85bc94d6e91f9cbe579a04102c8a74b388 100644
|
| --- a/chrome/browser/chromeos/preferences_chromeos_browsertest.cc
|
| +++ b/chrome/browser/chromeos/preferences_chromeos_browsertest.cc
|
| @@ -246,23 +246,27 @@ IN_PROC_BROWSER_TEST_F(PreferencesTest, MultiProfiles) {
|
| // Check that changing prefs of the active user doesn't affect prefs of the
|
| // inactive user.
|
| std::unique_ptr<base::DictionaryValue> prefs_backup =
|
| - prefs1->GetPreferenceValues();
|
| + prefs1->GetPreferenceValues(PrefService::INCLUDE_DEFAULTS);
|
| SetPrefs(prefs2, false);
|
| CheckSettingsCorrespondToPrefs(prefs2);
|
| - EXPECT_TRUE(prefs_backup->Equals(prefs1->GetPreferenceValues().get()));
|
| + EXPECT_TRUE(prefs_backup->Equals(
|
| + prefs1->GetPreferenceValues(PrefService::INCLUDE_DEFAULTS).get()));
|
| SetPrefs(prefs2, true);
|
| CheckSettingsCorrespondToPrefs(prefs2);
|
| - EXPECT_TRUE(prefs_backup->Equals(prefs1->GetPreferenceValues().get()));
|
| + EXPECT_TRUE(prefs_backup->Equals(
|
| + prefs1->GetPreferenceValues(PrefService::INCLUDE_DEFAULTS).get()));
|
|
|
| // Check that changing prefs of the inactive user doesn't affect prefs of the
|
| // active user.
|
| - prefs_backup = prefs2->GetPreferenceValues();
|
| + prefs_backup = prefs2->GetPreferenceValues(PrefService::INCLUDE_DEFAULTS);
|
| SetPrefs(prefs1, true);
|
| CheckSettingsCorrespondToPrefs(prefs2);
|
| - EXPECT_TRUE(prefs_backup->Equals(prefs2->GetPreferenceValues().get()));
|
| + EXPECT_TRUE(prefs_backup->Equals(
|
| + prefs2->GetPreferenceValues(PrefService::INCLUDE_DEFAULTS).get()));
|
| SetPrefs(prefs1, false);
|
| CheckSettingsCorrespondToPrefs(prefs2);
|
| - EXPECT_TRUE(prefs_backup->Equals(prefs2->GetPreferenceValues().get()));
|
| + EXPECT_TRUE(prefs_backup->Equals(
|
| + prefs2->GetPreferenceValues(PrefService::INCLUDE_DEFAULTS).get()));
|
|
|
| // Check that changing non-owner prefs doesn't change corresponding local
|
| // state prefs and vice versa.
|
|
|