[Extensions] Add extension feature generation code

extensions/common/features/simple_feature_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "extensions/common/features/simple_feature.h"
 
 #include <stddef.h>
 
 #include <string>
 
@@ skipping 99 matching lines @@
                                             test.manifest_version,
                                             test.platform).result());
   }
 }
 
 TEST_F(SimpleFeatureTest, Whitelist) {
   const std::string kIdFoo("fooabbbbccccddddeeeeffffgggghhhh");
   const std::string kIdBar("barabbbbccccddddeeeeffffgggghhhh");
   const std::string kIdBaz("bazabbbbccccddddeeeeffffgggghhhh");
   SimpleFeature feature;
-  feature.whitelist()->push_back(kIdFoo);
-  feature.whitelist()->push_back(kIdBar);
+  feature.whitelist_.push_back(kIdFoo);
+  feature.whitelist_.push_back(kIdBar);
 
   EXPECT_EQ(
       Feature::IS_AVAILABLE,
       feature.IsAvailableToManifest(kIdFoo,
                                     Manifest::TYPE_UNKNOWN,
                                     Manifest::INVALID_LOCATION,
                                     -1,
                                     Feature::UNSPECIFIED_PLATFORM).result());
   EXPECT_EQ(
       Feature::IS_AVAILABLE,
@@ skipping 11 matching lines @@
                                     -1,
                                     Feature::UNSPECIFIED_PLATFORM).result());
   EXPECT_EQ(
       Feature::NOT_FOUND_IN_WHITELIST,
       feature.IsAvailableToManifest(std::string(),
                                     Manifest::TYPE_UNKNOWN,
                                     Manifest::INVALID_LOCATION,
                                     -1,
                                     Feature::UNSPECIFIED_PLATFORM).result());
 
-  feature.extension_types()->push_back(Manifest::TYPE_LEGACY_PACKAGED_APP);
+  feature.extension_types_.push_back(Manifest::TYPE_LEGACY_PACKAGED_APP);
   EXPECT_EQ(
       Feature::NOT_FOUND_IN_WHITELIST,
       feature.IsAvailableToManifest(kIdBaz,
                                     Manifest::TYPE_LEGACY_PACKAGED_APP,
                                     Manifest::INVALID_LOCATION,
                                     -1,
                                     Feature::UNSPECIFIED_PLATFORM).result());
 }
 
 TEST_F(SimpleFeatureTest, HashedIdWhitelist) {
   // echo -n "fooabbbbccccddddeeeeffffgggghhhh" |
   //   sha1sum | tr '[:lower:]' '[:upper:]'
   const std::string kIdFoo("fooabbbbccccddddeeeeffffgggghhhh");
   const std::string kIdFooHashed("55BC7228A0D502A2A48C9BB16B07062A01E62897");
   SimpleFeature feature;
 
-  feature.whitelist()->push_back(kIdFooHashed);
+  feature.whitelist_.push_back(kIdFooHashed);
 
   EXPECT_EQ(
       Feature::IS_AVAILABLE,
       feature.IsAvailableToManifest(kIdFoo,
                                     Manifest::TYPE_UNKNOWN,
                                     Manifest::INVALID_LOCATION,
                                     -1,
                                     Feature::UNSPECIFIED_PLATFORM).result());
   EXPECT_NE(
       Feature::IS_AVAILABLE,
@@ skipping 16 matching lines @@
                                     Manifest::INVALID_LOCATION,
                                     -1,
                                     Feature::UNSPECIFIED_PLATFORM).result());
 }
 
 TEST_F(SimpleFeatureTest, Blacklist) {
   const std::string kIdFoo("fooabbbbccccddddeeeeffffgggghhhh");
   const std::string kIdBar("barabbbbccccddddeeeeffffgggghhhh");
   const std::string kIdBaz("bazabbbbccccddddeeeeffffgggghhhh");
   SimpleFeature feature;
-  feature.blacklist()->push_back(kIdFoo);
-  feature.blacklist()->push_back(kIdBar);
+  feature.blacklist_.push_back(kIdFoo);
+  feature.blacklist_.push_back(kIdBar);
 
   EXPECT_EQ(
       Feature::FOUND_IN_BLACKLIST,
       feature.IsAvailableToManifest(kIdFoo,
                                     Manifest::TYPE_UNKNOWN,
                                     Manifest::INVALID_LOCATION,
                                     -1,
                                     Feature::UNSPECIFIED_PLATFORM).result());
   EXPECT_EQ(
       Feature::FOUND_IN_BLACKLIST,
@@ skipping 19 matching lines @@
                                     Feature::UNSPECIFIED_PLATFORM).result());
 }
 
 TEST_F(SimpleFeatureTest, HashedIdBlacklist) {
   // echo -n "fooabbbbccccddddeeeeffffgggghhhh" |
   //   sha1sum | tr '[:lower:]' '[:upper:]'
   const std::string kIdFoo("fooabbbbccccddddeeeeffffgggghhhh");
   const std::string kIdFooHashed("55BC7228A0D502A2A48C9BB16B07062A01E62897");
   SimpleFeature feature;
 
-  feature.blacklist()->push_back(kIdFooHashed);
+  feature.blacklist_.push_back(kIdFooHashed);
 
   EXPECT_EQ(
       Feature::FOUND_IN_BLACKLIST,
       feature.IsAvailableToManifest(kIdFoo,
                                     Manifest::TYPE_UNKNOWN,
                                     Manifest::INVALID_LOCATION,
                                     -1,
                                     Feature::UNSPECIFIED_PLATFORM).result());
   EXPECT_NE(
       Feature::FOUND_IN_BLACKLIST,
@@ skipping 13 matching lines @@
       Feature::IS_AVAILABLE,
       feature.IsAvailableToManifest("tooshortforanextensionid",
                                     Manifest::TYPE_UNKNOWN,
                                     Manifest::INVALID_LOCATION,
                                     -1,
                                     Feature::UNSPECIFIED_PLATFORM).result());
 }
 
 TEST_F(SimpleFeatureTest, PackageType) {
   SimpleFeature feature;
-  feature.extension_types()->push_back(Manifest::TYPE_EXTENSION);
-  feature.extension_types()->push_back(Manifest::TYPE_LEGACY_PACKAGED_APP);
+  feature.extension_types_.push_back(Manifest::TYPE_EXTENSION);
+  feature.extension_types_.push_back(Manifest::TYPE_LEGACY_PACKAGED_APP);
 
   EXPECT_EQ(
       Feature::IS_AVAILABLE,
       feature.IsAvailableToManifest(std::string(),
                                     Manifest::TYPE_EXTENSION,
                                     Manifest::INVALID_LOCATION,
                                     -1,
                                     Feature::UNSPECIFIED_PLATFORM).result());
   EXPECT_EQ(
       Feature::IS_AVAILABLE,
@@ skipping 15 matching lines @@
       feature.IsAvailableToManifest(std::string(),
                                     Manifest::TYPE_THEME,
                                     Manifest::INVALID_LOCATION,
                                     -1,
                                     Feature::UNSPECIFIED_PLATFORM).result());
 }
 
 TEST_F(SimpleFeatureTest, Context) {
   SimpleFeature feature;
   feature.set_name("somefeature");
-  feature.contexts()->push_back(Feature::BLESSED_EXTENSION_CONTEXT);
-  feature.extension_types()->push_back(Manifest::TYPE_LEGACY_PACKAGED_APP);
-  feature.platforms()->push_back(Feature::CHROMEOS_PLATFORM);
+  feature.contexts_.push_back(Feature::BLESSED_EXTENSION_CONTEXT);
+  feature.extension_types_.push_back(Manifest::TYPE_LEGACY_PACKAGED_APP);
+  feature.platforms_.push_back(Feature::CHROMEOS_PLATFORM);
   feature.set_min_manifest_version(21);
   feature.set_max_manifest_version(25);
 
   base::DictionaryValue manifest;
   manifest.SetString("name", "test");
   manifest.SetString("version", "1");
   manifest.SetInteger("manifest_version", 21);
   manifest.SetString("app.launch.local_path", "foo.html");
 
   std::string error;
   scoped_refptr<const Extension> extension(Extension::Create(
       base::FilePath(), Manifest::INTERNAL, manifest, Extension::NO_FLAGS,
       &error));
   EXPECT_EQ("", error);
   ASSERT_TRUE(extension.get());
 
-  feature.whitelist()->push_back("monkey");
+  feature.whitelist_.push_back("monkey");
   EXPECT_EQ(Feature::NOT_FOUND_IN_WHITELIST, feature.IsAvailableToContext(
       extension.get(), Feature::BLESSED_EXTENSION_CONTEXT,
       Feature::CHROMEOS_PLATFORM).result());
-  feature.whitelist()->clear();
+  feature.whitelist_.clear();
 
-  feature.extension_types()->clear();
-  feature.extension_types()->push_back(Manifest::TYPE_THEME);
+  feature.extension_types_.clear();
+  feature.extension_types_.push_back(Manifest::TYPE_THEME);
   {
     Feature::Availability availability = feature.IsAvailableToContext(
         extension.get(), Feature::BLESSED_EXTENSION_CONTEXT,
         Feature::CHROMEOS_PLATFORM);
     EXPECT_EQ(Feature::INVALID_TYPE, availability.result());
     EXPECT_EQ("'somefeature' is only allowed for themes, "
               "but this is a legacy packaged app.",
               availability.message());
   }
 
-  feature.extension_types()->clear();
-  feature.extension_types()->push_back(Manifest::TYPE_LEGACY_PACKAGED_APP);
-  feature.contexts()->clear();
-  feature.contexts()->push_back(Feature::UNBLESSED_EXTENSION_CONTEXT);
-  feature.contexts()->push_back(Feature::CONTENT_SCRIPT_CONTEXT);
+  feature.extension_types_.clear();
+  feature.extension_types_.push_back(Manifest::TYPE_LEGACY_PACKAGED_APP);
+  feature.contexts_.clear();
+  feature.contexts_.push_back(Feature::UNBLESSED_EXTENSION_CONTEXT);
+  feature.contexts_.push_back(Feature::CONTENT_SCRIPT_CONTEXT);
   {
     Feature::Availability availability = feature.IsAvailableToContext(
         extension.get(), Feature::BLESSED_EXTENSION_CONTEXT,
         Feature::CHROMEOS_PLATFORM);
     EXPECT_EQ(Feature::INVALID_CONTEXT, availability.result());
     EXPECT_EQ("'somefeature' is only allowed to run in extension iframes and "
               "content scripts, but this is a privileged page",
               availability.message());
   }
 
-  feature.contexts()->push_back(Feature::WEB_PAGE_CONTEXT);
+  feature.contexts_.push_back(Feature::WEB_PAGE_CONTEXT);
   {
     Feature::Availability availability = feature.IsAvailableToContext(
         extension.get(), Feature::BLESSED_EXTENSION_CONTEXT,
         Feature::CHROMEOS_PLATFORM);
     EXPECT_EQ(Feature::INVALID_CONTEXT, availability.result());
     EXPECT_EQ("'somefeature' is only allowed to run in extension iframes, "
               "content scripts, and web pages, but this is a privileged page",
               availability.message());
   }
 
-  feature.contexts()->clear();
-  feature.contexts()->push_back(Feature::BLESSED_EXTENSION_CONTEXT);
+  feature.contexts_.clear();
+  feature.contexts_.push_back(Feature::BLESSED_EXTENSION_CONTEXT);
   feature.set_location(SimpleFeature::COMPONENT_LOCATION);
   EXPECT_EQ(Feature::INVALID_LOCATION, feature.IsAvailableToContext(
       extension.get(), Feature::BLESSED_EXTENSION_CONTEXT,
       Feature::CHROMEOS_PLATFORM).result());
   feature.set_location(SimpleFeature::UNSPECIFIED_LOCATION);
 
   EXPECT_EQ(Feature::INVALID_PLATFORM, feature.IsAvailableToContext(
       extension.get(), Feature::BLESSED_EXTENSION_CONTEXT,
       Feature::UNSPECIFIED_PLATFORM).result());
 
@@ skipping 52 matching lines @@
                                    Manifest::EXTERNAL_PREF_DOWNLOAD));
 
   // External component extensions can access the "external_component"
   // location.
   EXPECT_TRUE(LocationIsAvailable(SimpleFeature::EXTERNAL_COMPONENT_LOCATION,
                                   Manifest::EXTERNAL_COMPONENT));
 }
 
 TEST_F(SimpleFeatureTest, Platform) {
   SimpleFeature feature;
-  feature.platforms()->push_back(Feature::CHROMEOS_PLATFORM);
+  feature.platforms_.push_back(Feature::CHROMEOS_PLATFORM);
   EXPECT_EQ(Feature::IS_AVAILABLE,
             feature.IsAvailableToManifest(std::string(),
                                           Manifest::TYPE_UNKNOWN,
                                           Manifest::INVALID_LOCATION,
                                           -1,
                                           Feature::CHROMEOS_PLATFORM).result());
   EXPECT_EQ(
       Feature::INVALID_PLATFORM,
       feature.IsAvailableToManifest(std::string(),
                                     Manifest::TYPE_UNKNOWN,
@@ skipping 58 matching lines @@
                                     Manifest::TYPE_UNKNOWN,
                                     Manifest::INVALID_LOCATION,
                                     7,
                                     Feature::UNSPECIFIED_PLATFORM).result());
 }
 
 TEST_F(SimpleFeatureTest, ParseNull) {
   std::unique_ptr<base::DictionaryValue> value(new base::DictionaryValue());
   std::unique_ptr<SimpleFeature> feature(new SimpleFeature());
   feature->Parse(value.get());
-  EXPECT_TRUE(feature->whitelist()->empty());
-  EXPECT_TRUE(feature->extension_types()->empty());
-  EXPECT_TRUE(feature->contexts()->empty());
+  EXPECT_TRUE(feature->whitelist().empty());
+  EXPECT_TRUE(feature->extension_types().empty());
+  EXPECT_TRUE(feature->contexts().empty());
   EXPECT_EQ(SimpleFeature::UNSPECIFIED_LOCATION, feature->location());
-  EXPECT_TRUE(feature->platforms()->empty());
+  EXPECT_TRUE(feature->platforms().empty());
   EXPECT_EQ(0, feature->min_manifest_version());
   EXPECT_EQ(0, feature->max_manifest_version());
 }
 
 TEST_F(SimpleFeatureTest, ParseWhitelist) {
   std::unique_ptr<base::DictionaryValue> value(new base::DictionaryValue());
   base::ListValue* whitelist = new base::ListValue();
   whitelist->AppendString("foo");
   whitelist->AppendString("bar");
   value->Set("whitelist", whitelist);
   std::unique_ptr<SimpleFeature> feature(new SimpleFeature());
   feature->Parse(value.get());
-  EXPECT_EQ(2u, feature->whitelist()->size());
-  EXPECT_TRUE(STLCount(*(feature->whitelist()), "foo"));
-  EXPECT_TRUE(STLCount(*(feature->whitelist()), "bar"));
+  EXPECT_EQ(2u, feature->whitelist().size());
+  EXPECT_TRUE(STLCount(feature->whitelist(), "foo"));
+  EXPECT_TRUE(STLCount(feature->whitelist(), "bar"));
 }
 
 TEST_F(SimpleFeatureTest, ParsePackageTypes) {
   std::unique_ptr<base::DictionaryValue> value(new base::DictionaryValue());
   base::ListValue* extension_types = new base::ListValue();
   extension_types->AppendString("extension");
   extension_types->AppendString("theme");
   extension_types->AppendString("legacy_packaged_app");
   extension_types->AppendString("hosted_app");
   extension_types->AppendString("platform_app");
   extension_types->AppendString("shared_module");
   value->Set("extension_types", extension_types);
   std::unique_ptr<SimpleFeature> feature(new SimpleFeature());
   feature->Parse(value.get());
-  EXPECT_EQ(6u, feature->extension_types()->size());
+  EXPECT_EQ(6u, feature->extension_types().size());
+  EXPECT_TRUE(STLCount(feature->extension_types(), Manifest::TYPE_EXTENSION));
+  EXPECT_TRUE(STLCount(feature->extension_types(), Manifest::TYPE_THEME));
   EXPECT_TRUE(
-      STLCount(*(feature->extension_types()), Manifest::TYPE_EXTENSION));
+      STLCount(feature->extension_types(), Manifest::TYPE_LEGACY_PACKAGED_APP));
+  EXPECT_TRUE(STLCount(feature->extension_types(), Manifest::TYPE_HOSTED_APP));
   EXPECT_TRUE(
-      STLCount(*(feature->extension_types()), Manifest::TYPE_THEME));
+      STLCount(feature->extension_types(), Manifest::TYPE_PLATFORM_APP));
   EXPECT_TRUE(
-      STLCount(
-          *(feature->extension_types()), Manifest::TYPE_LEGACY_PACKAGED_APP));
-  EXPECT_TRUE(
-      STLCount(*(feature->extension_types()), Manifest::TYPE_HOSTED_APP));
-  EXPECT_TRUE(
-      STLCount(*(feature->extension_types()), Manifest::TYPE_PLATFORM_APP));
-  EXPECT_TRUE(
-      STLCount(*(feature->extension_types()), Manifest::TYPE_SHARED_MODULE));
+      STLCount(feature->extension_types(), Manifest::TYPE_SHARED_MODULE));
 
   value->SetString("extension_types", "all");
   std::unique_ptr<SimpleFeature> feature2(new SimpleFeature());
   feature2->Parse(value.get());
-  EXPECT_EQ(*(feature->extension_types()), *(feature2->extension_types()));
+  EXPECT_EQ(feature->extension_types(), feature2->extension_types());
 }
 
 TEST_F(SimpleFeatureTest, ParseContexts) {
   std::unique_ptr<base::DictionaryValue> value(new base::DictionaryValue());
   base::ListValue* contexts = new base::ListValue();
   contexts->AppendString("blessed_extension");
   contexts->AppendString("unblessed_extension");
   contexts->AppendString("content_script");
   contexts->AppendString("web_page");
   contexts->AppendString("blessed_web_page");
   contexts->AppendString("webui");
   contexts->AppendString("extension_service_worker");
   value->Set("contexts", contexts);
   std::unique_ptr<SimpleFeature> feature(new SimpleFeature());
   feature->Parse(value.get());
-  EXPECT_EQ(7u, feature->contexts()->size());
+  EXPECT_EQ(7u, feature->contexts().size());
   EXPECT_TRUE(
-      STLCount(*(feature->contexts()), Feature::BLESSED_EXTENSION_CONTEXT));
+      STLCount(feature->contexts(), Feature::BLESSED_EXTENSION_CONTEXT));
   EXPECT_TRUE(
-      STLCount(*(feature->contexts()), Feature::UNBLESSED_EXTENSION_CONTEXT));
-  EXPECT_TRUE(
-      STLCount(*(feature->contexts()), Feature::CONTENT_SCRIPT_CONTEXT));
-  EXPECT_TRUE(
-      STLCount(*(feature->contexts()), Feature::WEB_PAGE_CONTEXT));
-  EXPECT_TRUE(
-      STLCount(*(feature->contexts()), Feature::BLESSED_WEB_PAGE_CONTEXT));
+      STLCount(feature->contexts(), Feature::UNBLESSED_EXTENSION_CONTEXT));
+  EXPECT_TRUE(STLCount(feature->contexts(), Feature::CONTENT_SCRIPT_CONTEXT));
+  EXPECT_TRUE(STLCount(feature->contexts(), Feature::WEB_PAGE_CONTEXT));
+  EXPECT_TRUE(STLCount(feature->contexts(), Feature::BLESSED_WEB_PAGE_CONTEXT));
 
   value->SetString("contexts", "all");
   std::unique_ptr<SimpleFeature> feature2(new SimpleFeature());
   feature2->Parse(value.get());
-  EXPECT_EQ(*(feature->contexts()), *(feature2->contexts()));
+  EXPECT_EQ(feature->contexts(), feature2->contexts());
 }
 
 TEST_F(SimpleFeatureTest, ParseLocation) {
   std::unique_ptr<base::DictionaryValue> value(new base::DictionaryValue());
   value->SetString("location", "component");
   std::unique_ptr<SimpleFeature> feature(new SimpleFeature());
   feature->Parse(value.get());
   EXPECT_EQ(SimpleFeature::COMPONENT_LOCATION, feature->location());
 }
 
 TEST_F(SimpleFeatureTest, ParsePlatforms) {
   std::unique_ptr<base::DictionaryValue> value(new base::DictionaryValue());
   std::unique_ptr<SimpleFeature> feature(new SimpleFeature());
   base::ListValue* platforms = new base::ListValue();
   value->Set("platforms", platforms);
   feature->Parse(value.get());
-  EXPECT_TRUE(feature->platforms()->empty());
+  EXPECT_TRUE(feature->platforms().empty());
 
   platforms->AppendString("chromeos");
   feature->Parse(value.get());
-  EXPECT_FALSE(feature->platforms()->empty());
-  EXPECT_EQ(Feature::CHROMEOS_PLATFORM, *feature->platforms()->begin());
+  EXPECT_FALSE(feature->platforms().empty());
+  EXPECT_EQ(Feature::CHROMEOS_PLATFORM, *feature->platforms().begin());
 
   platforms->Clear();
   platforms->AppendString("win");
   feature->Parse(value.get());
-  EXPECT_FALSE(feature->platforms()->empty());
-  EXPECT_EQ(Feature::WIN_PLATFORM, *feature->platforms()->begin());
+  EXPECT_FALSE(feature->platforms().empty());
+  EXPECT_EQ(Feature::WIN_PLATFORM, *feature->platforms().begin());
 
   platforms->Clear();
   platforms->AppendString("win");
   platforms->AppendString("chromeos");
   feature->Parse(value.get());
   std::vector<Feature::Platform> expected_platforms;
   expected_platforms.push_back(Feature::CHROMEOS_PLATFORM);
   expected_platforms.push_back(Feature::WIN_PLATFORM);
 
-  EXPECT_FALSE(feature->platforms()->empty());
-  EXPECT_EQ(expected_platforms, *feature->platforms());
+  EXPECT_FALSE(feature->platforms().empty());
+  EXPECT_EQ(expected_platforms, feature->platforms());
 }
 
 TEST_F(SimpleFeatureTest, ParseManifestVersion) {
   std::unique_ptr<base::DictionaryValue> value(new base::DictionaryValue());
   value->SetInteger("min_manifest_version", 1);
   value->SetInteger("max_manifest_version", 5);
   std::unique_ptr<SimpleFeature> feature(new SimpleFeature());
   feature->Parse(value.get());
   EXPECT_EQ(1, feature->min_manifest_version());
   EXPECT_EQ(5, feature->max_manifest_version());
 }
 
 TEST_F(SimpleFeatureTest, Inheritance) {
   SimpleFeature feature;
-  feature.whitelist()->push_back("foo");
-  feature.extension_types()->push_back(Manifest::TYPE_THEME);
-  feature.contexts()->push_back(Feature::BLESSED_EXTENSION_CONTEXT);
+  feature.whitelist_.push_back("foo");
+  feature.extension_types_.push_back(Manifest::TYPE_THEME);
+  feature.contexts_.push_back(Feature::BLESSED_EXTENSION_CONTEXT);
   feature.set_location(SimpleFeature::COMPONENT_LOCATION);
-  feature.platforms()->push_back(Feature::CHROMEOS_PLATFORM);
+  feature.platforms_.push_back(Feature::CHROMEOS_PLATFORM);
   feature.set_min_manifest_version(1);
   feature.set_max_manifest_version(2);
 
   // Test additive parsing. Parsing an empty dictionary should result in no
   // changes to a SimpleFeature.
   base::DictionaryValue definition;
   feature.Parse(&definition);
-  EXPECT_EQ(1u, feature.whitelist()->size());
-  EXPECT_EQ(1u, feature.extension_types()->size());
-  EXPECT_EQ(1u, feature.contexts()->size());
-  EXPECT_EQ(1, STLCount(*(feature.whitelist()), "foo"));
+  EXPECT_EQ(1u, feature.whitelist().size());
+  EXPECT_EQ(1u, feature.extension_types().size());
+  EXPECT_EQ(1u, feature.contexts().size());
+  EXPECT_EQ(1, STLCount(feature.whitelist(), "foo"));
   EXPECT_EQ(SimpleFeature::COMPONENT_LOCATION, feature.location());
-  EXPECT_EQ(1u, feature.platforms()->size());
-  EXPECT_EQ(1, STLCount(*(feature.platforms()), Feature::CHROMEOS_PLATFORM));
+  EXPECT_EQ(1u, feature.platforms().size());
+  EXPECT_EQ(1, STLCount(feature.platforms(), Feature::CHROMEOS_PLATFORM));
   EXPECT_EQ(1, feature.min_manifest_version());
   EXPECT_EQ(2, feature.max_manifest_version());
 
   base::ListValue* whitelist = new base::ListValue();
   base::ListValue* extension_types = new base::ListValue();
   base::ListValue* contexts = new base::ListValue();
   whitelist->AppendString("bar");
   extension_types->AppendString("extension");
   contexts->AppendString("unblessed_extension");
   definition.Set("whitelist", whitelist);
   definition.Set("extension_types", extension_types);
   definition.Set("contexts", contexts);
   // Can't test location or platform because we only have one value so far.
   definition.Set("min_manifest_version", new base::FundamentalValue(2));
   definition.Set("max_manifest_version", new base::FundamentalValue(3));
 
   feature.Parse(&definition);
-  EXPECT_EQ(1u, feature.whitelist()->size());
-  EXPECT_EQ(1u, feature.extension_types()->size());
-  EXPECT_EQ(1u, feature.contexts()->size());
-  EXPECT_EQ(1, STLCount(*(feature.whitelist()), "bar"));
+  EXPECT_EQ(1u, feature.whitelist().size());
+  EXPECT_EQ(1u, feature.extension_types().size());
+  EXPECT_EQ(1u, feature.contexts().size());
+  EXPECT_EQ(1, STLCount(feature.whitelist(), "bar"));
+  EXPECT_EQ(1, STLCount(feature.extension_types(), Manifest::TYPE_EXTENSION));
   EXPECT_EQ(1,
-            STLCount(*(feature.extension_types()), Manifest::TYPE_EXTENSION));
-  EXPECT_EQ(1,
-            STLCount(
-                *(feature.contexts()), Feature::UNBLESSED_EXTENSION_CONTEXT));
+            STLCount(feature.contexts(), Feature::UNBLESSED_EXTENSION_CONTEXT));
   EXPECT_EQ(2, feature.min_manifest_version());
   EXPECT_EQ(3, feature.max_manifest_version());
 }
 
 TEST_F(SimpleFeatureTest, CommandLineSwitch) {
   SimpleFeature feature;
   feature.set_command_line_switch("laser-beams");
   {
     EXPECT_EQ(Feature::MISSING_COMMAND_LINE_SWITCH,
               feature.IsAvailableToEnvironment().result());
@@ skipping 280 matching lines @@
         Feature::IS_AVAILABLE,
         feature->IsAvailableToManifest("1",
                                        Manifest::TYPE_EXTENSION,
                                        Manifest::INVALID_LOCATION,
                                        Feature::UNSPECIFIED_PLATFORM,
                                        Feature::GetCurrentPlatform()).result());
   }
 }
 
 }  // namespace extensions