summaryrefslogtreecommitdiffstats
path: root/chrome/common/extensions/features/complex_feature_unittest.cc
diff options
context:
space:
mode:
authorkalman@chromium.org <kalman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-30 03:37:28 +0000
committerkalman@chromium.org <kalman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-30 03:37:28 +0000
commit4f4173f3dbefd7b11fe4cd050bd50050d5300103 (patch)
tree52f40a241577b86baf9e8dba7ce184184754b7fd /chrome/common/extensions/features/complex_feature_unittest.cc
parent4177df53e6c54a6256d0f28fa37ca029859719e3 (diff)
downloadchromium_src-4f4173f3dbefd7b11fe4cd050bd50050d5300103.zip
chromium_src-4f4173f3dbefd7b11fe4cd050bd50050d5300103.tar.gz
chromium_src-4f4173f3dbefd7b11fe4cd050bd50050d5300103.tar.bz2
Renamed packaged_app to legacy_packaged_app in extension feature files. It's
confusing otherwise since the C++ enum is called LEGACY_PACKAGED_APP. Review URL: https://chromiumcodereview.appspot.com/23691012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@220498 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/extensions/features/complex_feature_unittest.cc')
-rw-r--r--chrome/common/extensions/features/complex_feature_unittest.cc13
1 files changed, 8 insertions, 5 deletions
diff --git a/chrome/common/extensions/features/complex_feature_unittest.cc b/chrome/common/extensions/features/complex_feature_unittest.cc
index 6e7ed65..51f26f6 100644
--- a/chrome/common/extensions/features/complex_feature_unittest.cc
+++ b/chrome/common/extensions/features/complex_feature_unittest.cc
@@ -41,15 +41,17 @@ TEST_F(ExtensionComplexFeatureTest, MultipleRulesWhitelist) {
scoped_ptr<base::DictionaryValue> rule(
DictionaryBuilder()
.Set("whitelist", ListBuilder().Append(kIdFoo))
- .Set("extension_types", ListBuilder().Append("extension")).Build());
+ .Set("extension_types", ListBuilder()
+ .Append("extension")).Build());
simple_feature->Parse(rule.get());
features->push_back(simple_feature.release());
- // Rule: "packaged_app", whitelist "bar".
+ // Rule: "legacy_packaged_app", whitelist "bar".
simple_feature.reset(new SimpleFeature());
rule = DictionaryBuilder()
.Set("whitelist", ListBuilder().Append(kIdBar))
- .Set("extension_types", ListBuilder().Append("packaged_app")).Build();
+ .Set("extension_types", ListBuilder()
+ .Append("legacy_packaged_app")).Build();
simple_feature->Parse(rule.get());
features->push_back(simple_feature.release());
@@ -98,11 +100,12 @@ TEST_F(ExtensionComplexFeatureTest, MultipleRulesChannels) {
simple_feature->Parse(rule.get());
features->push_back(simple_feature.release());
- // Rule: "packaged_app", channel stable.
+ // Rule: "legacy_packaged_app", channel stable.
simple_feature.reset(new SimpleFeature());
rule = DictionaryBuilder()
.Set("channel", "stable")
- .Set("extension_types", ListBuilder().Append("packaged_app")).Build();
+ .Set("extension_types", ListBuilder()
+ .Append("legacy_packaged_app")).Build();
simple_feature->Parse(rule.get());
features->push_back(simple_feature.release());