| Index: chrome/browser/extensions/settings/settings_sync_unittest.cc
|
| diff --git a/chrome/browser/extensions/settings/settings_sync_unittest.cc b/chrome/browser/extensions/settings/settings_sync_unittest.cc
|
| index 26ce96a19e8c59c8e9fc8389d1d140f886c567f7..430cdd6e08138c2cb9b9663815f6453098f73e9f 100644
|
| --- a/chrome/browser/extensions/settings/settings_sync_unittest.cc
|
| +++ b/chrome/browser/extensions/settings/settings_sync_unittest.cc
|
| @@ -300,7 +300,7 @@ TEST_F(ExtensionSettingsSyncTest, NoDataDoesNotInvokeSync) {
|
|
|
| TEST_F(ExtensionSettingsSyncTest, InSyncDataDoesNotInvokeSync) {
|
| syncer::ModelType model_type = syncer::APP_SETTINGS;
|
| - Extension::Type type = Extension::TYPE_PACKAGED_APP;
|
| + Extension::Type type = Extension::TYPE_LEGACY_PACKAGED_APP;
|
|
|
| StringValue value1("fooValue");
|
| ListValue value2;
|
| @@ -382,7 +382,7 @@ TEST_F(ExtensionSettingsSyncTest, LocalDataWithNoSyncDataIsPushedToSync) {
|
|
|
| TEST_F(ExtensionSettingsSyncTest, AnySyncDataOverwritesLocalData) {
|
| syncer::ModelType model_type = syncer::APP_SETTINGS;
|
| - Extension::Type type = Extension::TYPE_PACKAGED_APP;
|
| + Extension::Type type = Extension::TYPE_LEGACY_PACKAGED_APP;
|
|
|
| StringValue value1("fooValue");
|
| ListValue value2;
|
| @@ -495,7 +495,7 @@ TEST_F(ExtensionSettingsSyncTest, ProcessSyncChanges) {
|
|
|
| TEST_F(ExtensionSettingsSyncTest, PushToSync) {
|
| syncer::ModelType model_type = syncer::APP_SETTINGS;
|
| - Extension::Type type = Extension::TYPE_PACKAGED_APP;
|
| + Extension::Type type = Extension::TYPE_LEGACY_PACKAGED_APP;
|
|
|
| StringValue value1("fooValue");
|
| ListValue value2;
|
| @@ -644,7 +644,7 @@ TEST_F(ExtensionSettingsSyncTest, ExtensionAndAppSettingsSyncSeparately) {
|
| ValueStore* storage1 = AddExtensionAndGetStorage(
|
| "s1", Extension::TYPE_EXTENSION);
|
| ValueStore* storage2 = AddExtensionAndGetStorage(
|
| - "s2", Extension::TYPE_PACKAGED_APP);
|
| + "s2", Extension::TYPE_LEGACY_PACKAGED_APP);
|
|
|
| storage1->Set(DEFAULTS, "foo", value1);
|
| storage2->Set(DEFAULTS, "bar", value2);
|
| @@ -893,7 +893,7 @@ TEST_F(ExtensionSettingsSyncTest, FailingProcessChangesDisablesSync) {
|
| // The test above tests a failing ProcessSyncChanges too, but here test with
|
| // an initially passing MergeDataAndStartSyncing.
|
| syncer::ModelType model_type = syncer::APP_SETTINGS;
|
| - Extension::Type type = Extension::TYPE_PACKAGED_APP;
|
| + Extension::Type type = Extension::TYPE_LEGACY_PACKAGED_APP;
|
|
|
| StringValue fooValue("fooValue");
|
| StringValue barValue("barValue");
|
| @@ -1046,7 +1046,7 @@ TEST_F(ExtensionSettingsSyncTest, FailingGetAllSyncDataDoesntStopSync) {
|
|
|
| TEST_F(ExtensionSettingsSyncTest, FailureToReadChangesToPushDisablesSync) {
|
| syncer::ModelType model_type = syncer::APP_SETTINGS;
|
| - Extension::Type type = Extension::TYPE_PACKAGED_APP;
|
| + Extension::Type type = Extension::TYPE_LEGACY_PACKAGED_APP;
|
|
|
| StringValue fooValue("fooValue");
|
| StringValue barValue("barValue");
|
| @@ -1339,7 +1339,7 @@ TEST_F(ExtensionSettingsSyncTest, FailureToPushLocalChangeDisablesSync) {
|
| TEST_F(ExtensionSettingsSyncTest,
|
| LargeOutgoingChangeRejectedButIncomingAccepted) {
|
| syncer::ModelType model_type = syncer::APP_SETTINGS;
|
| - Extension::Type type = Extension::TYPE_PACKAGED_APP;
|
| + Extension::Type type = Extension::TYPE_LEGACY_PACKAGED_APP;
|
|
|
| // This value should be larger than the limit in settings_backend.cc.
|
| std::string string_5k;
|
|
|