[Extensions] Remove JSONFeatureProvider, SimpleFeature::Parse

chrome/common/extensions/api/common_extension_api_unittest.cc

 // Copyright (c) 2012 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/extension_api.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
-#include "base/json/json_reader.h"
-#include "base/json/json_writer.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/path_service.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "chrome/common/chrome_paths.h"
+#include "chrome/common/extensions/extension_features_unittest.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_builder.h"
-#include "extensions/common/features/api_feature.h"
-#include "extensions/common/features/json_feature_provider.h"
 #include "extensions/common/features/simple_feature.h"
 #include "extensions/common/manifest.h"
 #include "extensions/common/manifest_constants.h"
 #include "extensions/common/test_util.h"
 #include "extensions/common/value_builder.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace extensions {
 
 using test_util::BuildExtension;
 
-SimpleFeature* CreateAPIFeature() {
-  return new APIFeature();
-}
-
 TEST(ExtensionAPITest, Creation) {
   ExtensionAPI* shared_instance = ExtensionAPI::GetSharedInstance();
   EXPECT_EQ(shared_instance, ExtensionAPI::GetSharedInstance());
 
   std::unique_ptr<ExtensionAPI> new_instance(
       ExtensionAPI::CreateWithDefaultConfiguration());
   EXPECT_NE(new_instance.get(),
             std::unique_ptr<ExtensionAPI>(
                 ExtensionAPI::CreateWithDefaultConfiguration())
                 .get());
@@ skipping 104 matching lines @@
     { "parent3.noparent", true, Feature::CONTENT_SCRIPT_CONTEXT, GURL() },
     { "parent3.noparent", true, Feature::BLESSED_EXTENSION_CONTEXT, GURL() },
     { "parent3.noparent", true, Feature::UNBLESSED_EXTENSION_CONTEXT, GURL() },
     { "parent3.noparent.child", true, Feature::CONTENT_SCRIPT_CONTEXT, GURL() },
     { "parent3.noparent.child", true, Feature::BLESSED_EXTENSION_CONTEXT,
         GURL() },
     { "parent3.noparent.child", true, Feature::UNBLESSED_EXTENSION_CONTEXT,
         GURL() }
   };
 
-  base::FilePath api_features_path;
-  PathService::Get(chrome::DIR_TEST_DATA, &api_features_path);
-  api_features_path = api_features_path.AppendASCII("extensions")
-      .AppendASCII("extension_api_unittest")
-      .AppendASCII("api_features.json");
+  const char* test_features[] = {

[Lei Zhang, 2016/08/16 19:41:57]

const char* const kTestFeatures[]

[Devlin, 2016/08/17 01:10:35]

Done.

+      "test1", "test2", "test3",   "test4",   "test5",
+      "test6", "test7", "parent1", "parent2", "parent3",
+  };
 
-  std::string api_features_str;
-  ASSERT_TRUE(base::ReadFileToString(
-      api_features_path, &api_features_str)) << "api_features.json";
-
-  std::unique_ptr<base::DictionaryValue> value(
-      static_cast<base::DictionaryValue*>(
-          base::JSONReader::Read(api_features_str).release()));
-  JSONFeatureProvider api_feature_provider(*value, CreateAPIFeature);
+  UnittestFeatureProvider api_feature_provider;
 
   for (size_t i = 0; i < arraysize(test_data); ++i) {
     ExtensionAPI api;
     api.RegisterDependencyProvider("api", &api_feature_provider);
-    for (base::DictionaryValue::Iterator iter(*value); !iter.IsAtEnd();
-         iter.Advance()) {
-      if (iter.key().find(".") == std::string::npos)
-        api.RegisterSchemaResource(iter.key(), 0);
-    }
+    for (const auto& key : test_features)
+      api.RegisterSchemaResource(key, 0);
+    ExtensionAPI::OverrideSharedInstanceForTest scope(&api);
 
-    ExtensionAPI::OverrideSharedInstanceForTest scope(&api);
     bool expected = test_data[i].expect_is_available;
     Feature::Availability availability =
         api.IsAvailable(test_data[i].api_full_name,
                         NULL,
                         test_data[i].context,
                         test_data[i].url);
     EXPECT_EQ(expected, availability.is_available())
         << base::StringPrintf("Test %d: Feature '%s' was %s: %s",
                               static_cast<int>(i),
                               test_data[i].api_full_name.c_str(),
@@ skipping 49 matching lines @@
         GURL("http://google.com") },
     { "test3", true, Feature::CONTENT_SCRIPT_CONTEXT, NULL, GURL() },
     { "test3", true, Feature::WEB_PAGE_CONTEXT, NULL, GURL("http://foo.com") },
     { "test4.foo", true, Feature::CONTENT_SCRIPT_CONTEXT, NULL, GURL() },
     { "test7", false, Feature::WEB_PAGE_CONTEXT, NULL,
         GURL("http://google.com") },
     { "test7", true, Feature::WEB_PAGE_CONTEXT, NULL, GURL("http://foo.com") },
     { "test7", false, Feature::WEB_PAGE_CONTEXT, NULL, GURL("http://bar.com") }
   };
 
-  base::FilePath api_features_path;
-  PathService::Get(chrome::DIR_TEST_DATA, &api_features_path);
-  api_features_path = api_features_path.AppendASCII("extensions")
-      .AppendASCII("extension_api_unittest")
-      .AppendASCII("api_features.json");
+  const char* test_features[] = {

[Lei Zhang, 2016/08/16 19:41:57]

Ditto, or just declare this once in an anonymous namespace?

[Devlin, 2016/08/17 01:10:35]

Done.

+      "test1", "test2", "test3",   "test4",   "test5",
+      "test6", "test7", "parent1", "parent2", "parent3",
+  };
 
-  std::string api_features_str;
-  ASSERT_TRUE(base::ReadFileToString(
-      api_features_path, &api_features_str)) << "api_features.json";
-
-  std::unique_ptr<base::DictionaryValue> value(
-      static_cast<base::DictionaryValue*>(
-          base::JSONReader::Read(api_features_str).release()));
-  JSONFeatureProvider api_feature_provider(*value, CreateAPIFeature);
+  UnittestFeatureProvider api_feature_provider;
 
   for (size_t i = 0; i < arraysize(test_data); ++i) {
     ExtensionAPI api;
     api.RegisterDependencyProvider("api", &api_feature_provider);
-    for (base::DictionaryValue::Iterator iter(*value); !iter.IsAtEnd();
-         iter.Advance()) {
-      if (iter.key().find(".") == std::string::npos)
-        api.RegisterSchemaResource(iter.key(), 0);
-    }
+    for (const auto& key : test_features)
+      api.RegisterSchemaResource(key, 0);
+    ExtensionAPI::OverrideSharedInstanceForTest scope(&api);
 
     Feature* test_feature =
         api_feature_provider.GetFeature(test_data[i].api_full_name);
     ASSERT_TRUE(test_feature);
     EXPECT_EQ(test_data[i].expect_is_available,
               api.IsAnyFeatureAvailableToContext(*test_feature,
                                                  test_data[i].extension,
                                                  test_data[i].context,
                                                  test_data[i].url))
         << i;
@@ skipping 375 matching lines @@
     EXPECT_TRUE(feature->whitelist().empty());
     EXPECT_TRUE(feature->extension_types().empty());
 
     EXPECT_EQ(SimpleFeature::UNSPECIFIED_LOCATION, feature->location());
     EXPECT_TRUE(feature->platforms().empty());
     EXPECT_EQ(0, feature->min_manifest_version());
     EXPECT_EQ(0, feature->max_manifest_version());
   }
 }
 
-TEST(ExtensionAPITest, JSONFeatureProviderDoesNotStoreInvalidFeatures) {
-  base::DictionaryValue features;
-  std::unique_ptr<base::DictionaryValue> feature_value(
-      new base::DictionaryValue());
-  // This feature is invalid (it needs an extension context), so the
-  // JSONFeatureProvider should not store it.
-  feature_value->SetString("channel", "stable");
-  features.Set("test", std::move(feature_value));
-  JSONFeatureProvider api_feature_provider(features, CreateAPIFeature);
-  EXPECT_FALSE(api_feature_provider.GetFeature("test"));
-}
-
 static void GetDictionaryFromList(const base::DictionaryValue* schema,
                                   const std::string& list_name,
                                   const int list_index,
                                   const base::DictionaryValue** out) {
   const base::ListValue* list;
   EXPECT_TRUE(schema->GetList(list_name, &list));
   EXPECT_TRUE(list->GetDictionary(list_index, out));
 }
 
 TEST(ExtensionAPITest, TypesHaveNamespace) {
@@ skipping 134 matching lines @@
                                          extension.get(),
                                          Feature::BLESSED_EXTENSION_CONTEXT,
                                          GURL()).is_available());
   EXPECT_FALSE(extension_api->IsAvailable("pageAction",
                                           extension.get(),
                                           Feature::BLESSED_EXTENSION_CONTEXT,
                                           GURL()).is_available());
 }
 
 }  // namespace extensions