From c4f459d484f47ee4636e3c586589e474544e4e3d Mon Sep 17 00:00:00 2001 From: "grv@chromium.org" Date: Fri, 28 Sep 2012 04:40:10 +0000 Subject: Rename PACKAGED_APP references to LEGACY_PACKAGED_APP BUG=151656 Review URL: https://chromiumcodereview.appspot.com/10909239 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159211 0039d316-1c4b-4281-b951-d872f2087c98 --- .../browser/extensions/settings/settings_sync_unittest.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to '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 26ce96a..430cdd6 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; -- cgit v1.1