| Index: chrome/browser/extensions/chrome_app_sorting_unittest.cc
|
| diff --git a/chrome/browser/extensions/chrome_app_sorting_unittest.cc b/chrome/browser/extensions/chrome_app_sorting_unittest.cc
|
| index a11315fa27c516686ef9714a57c63d99ba4261e3..7400e85fb7771d702a0568d50d0709ccfaa1e07a 100644
|
| --- a/chrome/browser/extensions/chrome_app_sorting_unittest.cc
|
| +++ b/chrome/browser/extensions/chrome_app_sorting_unittest.cc
|
| @@ -152,26 +152,20 @@ class ChromeAppSortingInitialize : public PrefsPrepopulatedTestBase {
|
| // Setup the deprecated preferences.
|
| ExtensionScopedPrefs* scoped_prefs =
|
| static_cast<ExtensionScopedPrefs*>(prefs());
|
| - scoped_prefs->UpdateExtensionPref(extension1()->id(),
|
| - kPrefAppLaunchIndexDeprecated,
|
| - new base::FundamentalValue(0));
|
| - scoped_prefs->UpdateExtensionPref(extension1()->id(),
|
| - kPrefPageIndexDeprecated,
|
| - new base::FundamentalValue(0));
|
| -
|
| - scoped_prefs->UpdateExtensionPref(extension2()->id(),
|
| - kPrefAppLaunchIndexDeprecated,
|
| - new base::FundamentalValue(1));
|
| - scoped_prefs->UpdateExtensionPref(extension2()->id(),
|
| - kPrefPageIndexDeprecated,
|
| - new base::FundamentalValue(0));
|
| -
|
| - scoped_prefs->UpdateExtensionPref(extension3()->id(),
|
| - kPrefAppLaunchIndexDeprecated,
|
| - new base::FundamentalValue(0));
|
| - scoped_prefs->UpdateExtensionPref(extension3()->id(),
|
| - kPrefPageIndexDeprecated,
|
| - new base::FundamentalValue(1));
|
| + scoped_prefs->UpdateExtensionPref(
|
| + extension1()->id(), kPrefAppLaunchIndexDeprecated, new base::Value(0));
|
| + scoped_prefs->UpdateExtensionPref(
|
| + extension1()->id(), kPrefPageIndexDeprecated, new base::Value(0));
|
| +
|
| + scoped_prefs->UpdateExtensionPref(
|
| + extension2()->id(), kPrefAppLaunchIndexDeprecated, new base::Value(1));
|
| + scoped_prefs->UpdateExtensionPref(
|
| + extension2()->id(), kPrefPageIndexDeprecated, new base::Value(0));
|
| +
|
| + scoped_prefs->UpdateExtensionPref(
|
| + extension3()->id(), kPrefAppLaunchIndexDeprecated, new base::Value(0));
|
| + scoped_prefs->UpdateExtensionPref(
|
| + extension3()->id(), kPrefPageIndexDeprecated, new base::Value(1));
|
|
|
| // We insert the ids in reverse order so that we have to deal with the
|
| // element on the 2nd page before the 1st page is seen.
|
| @@ -259,12 +253,10 @@ class ChromeAppSortingMigrateAppIndexInvalid
|
| // Setup the deprecated preference.
|
| ExtensionScopedPrefs* scoped_prefs =
|
| static_cast<ExtensionScopedPrefs*>(prefs());
|
| - scoped_prefs->UpdateExtensionPref(extension1()->id(),
|
| - kPrefAppLaunchIndexDeprecated,
|
| - new base::FundamentalValue(0));
|
| - scoped_prefs->UpdateExtensionPref(extension1()->id(),
|
| - kPrefPageIndexDeprecated,
|
| - new base::FundamentalValue(-1));
|
| + scoped_prefs->UpdateExtensionPref(
|
| + extension1()->id(), kPrefAppLaunchIndexDeprecated, new base::Value(0));
|
| + scoped_prefs->UpdateExtensionPref(
|
| + extension1()->id(), kPrefPageIndexDeprecated, new base::Value(-1));
|
| }
|
| void Verify() override {
|
| // Make sure that the invalid page_index wasn't converted over.
|
|
|