Refactor Uses of std::set to std::vector in SimpleFeature

extensions/common/features/base_feature_provider_unittest.cc

Index: extensions/common/features/base_feature_provider_unittest.cc
diff --git a/extensions/common/features/base_feature_provider_unittest.cc b/extensions/common/features/base_feature_provider_unittest.cc
index 8f4a3ba3ca35f2c808f5bcef34378fa1683a8295..dc41366eb20ef5463f317de3bf290de63f21c6a9 100644
--- a/extensions/common/features/base_feature_provider_unittest.cc
+++ b/extensions/common/features/base_feature_provider_unittest.cc
@@ -4,9 +4,11 @@
 
 #include "extensions/common/features/base_feature_provider.h"
 
+#include <algorithm>
 #include <set>
 #include <string>
 
+#include "base/stl_util.h"
 #include "extensions/common/extension_builder.h"
 #include "extensions/common/features/feature.h"
 #include "extensions/common/features/simple_feature.h"
@@ -24,14 +26,16 @@ TEST(BaseFeatureProviderTest, ManifestFeatureTypes) {
   const SimpleFeature* feature = static_cast<const SimpleFeature*>(
       FeatureProvider::GetManifestFeature("description"));
   ASSERT_TRUE(feature);
-  const std::set<Manifest::Type>* extension_types = feature->extension_types();
+  const std::vector<Manifest::Type>* extension_types =
+      feature->extension_types();
   EXPECT_EQ(6u, extension_types->size());
-  EXPECT_EQ(1u, extension_types->count(Manifest::TYPE_EXTENSION));
-  EXPECT_EQ(1u, extension_types->count(Manifest::TYPE_LEGACY_PACKAGED_APP));
-  EXPECT_EQ(1u, extension_types->count(Manifest::TYPE_PLATFORM_APP));
-  EXPECT_EQ(1u, extension_types->count(Manifest::TYPE_HOSTED_APP));
-  EXPECT_EQ(1u, extension_types->count(Manifest::TYPE_THEME));
-  EXPECT_EQ(1u, extension_types->count(Manifest::TYPE_SHARED_MODULE));
+  EXPECT_EQ(1, STLCount(*(extension_types), Manifest::TYPE_EXTENSION));
+  EXPECT_EQ(1,
+            STLCount(*(extension_types), Manifest::TYPE_LEGACY_PACKAGED_APP));
+  EXPECT_EQ(1, STLCount(*(extension_types), Manifest::TYPE_PLATFORM_APP));
+  EXPECT_EQ(1, STLCount(*(extension_types), Manifest::TYPE_HOSTED_APP));
+  EXPECT_EQ(1, STLCount(*(extension_types), Manifest::TYPE_THEME));
+  EXPECT_EQ(1, STLCount(*(extension_types), Manifest::TYPE_SHARED_MODULE));
 }
 
 // Tests that real manifest features have the correct availability for an
@@ -79,11 +83,13 @@ TEST(BaseFeatureProviderTest, PermissionFeatureTypes) {
   const SimpleFeature* feature = static_cast<const SimpleFeature*>(
       BaseFeatureProvider::GetPermissionFeature("power"));
   ASSERT_TRUE(feature);
-  const std::set<Manifest::Type>* extension_types = feature->extension_types();
+  const std::vector<Manifest::Type>* extension_types =
+      feature->extension_types();
   EXPECT_EQ(3u, extension_types->size());
-  EXPECT_EQ(1u, extension_types->count(Manifest::TYPE_EXTENSION));
-  EXPECT_EQ(1u, extension_types->count(Manifest::TYPE_LEGACY_PACKAGED_APP));
-  EXPECT_EQ(1u, extension_types->count(Manifest::TYPE_PLATFORM_APP));
+  EXPECT_EQ(1, STLCount(*(extension_types), Manifest::TYPE_EXTENSION));
+  EXPECT_EQ(1,
+            STLCount(*(extension_types), Manifest::TYPE_LEGACY_PACKAGED_APP));
+  EXPECT_EQ(1, STLCount(*(extension_types), Manifest::TYPE_PLATFORM_APP));
 }
 
 // Tests that real permission features have the correct availability for an app.