Convert tabs, windows, and extension APIs to feature system.

chrome/common/extensions/api/extension_api.h

Index: chrome/common/extensions/api/extension_api.h
diff --git a/chrome/common/extensions/api/extension_api.h b/chrome/common/extensions/api/extension_api.h
index 1d489c34225d038e1b8d9c3d75c206958b747ae3..ec1c7767003dadade79f396f520933baa5bf8d24 100644
--- a/chrome/common/extensions/api/extension_api.h
+++ b/chrome/common/extensions/api/extension_api.h
@@ -32,6 +32,7 @@ class ExtensionPermissionSet;
 
 namespace extensions {
 
+class ExtensionAPIFeature;
 class Feature;
 
 // C++ Wrapper for the JSON API definitions in chrome/common/extensions/api/.
@@ -81,6 +82,8 @@ class ExtensionAPI : public FeatureProvider {
   // be called from extension code which is running in its own designated
   // extension process. They cannot be called from extension code running in
   // content scripts, or other low-privileged contexts.
+  //
+  // TODO(aa): Remove this when everything is ported.
   bool IsPrivileged(const std::string& name);
 
   // Gets the schema for the extension API with namespace |full_name|.
@@ -175,9 +178,8 @@ class ExtensionAPI : public FeatureProvider {
   // APIs that have URL matching permissions.
   std::map<std::string, URLPatternSet> url_matching_apis_;
 
-  typedef std::map<std::string, linked_ptr<Feature> > FeatureMap;
-  typedef std::map<std::string, linked_ptr<FeatureMap> > APIFeatureMap;
-  APIFeatureMap features_;
+  typedef std::map<std::string, linked_ptr<ExtensionAPIFeature> > FeatureMap;
+  FeatureMap features_;
 
   // FeatureProviders used for resolving dependencies.
   typedef std::map<std::string, FeatureProvider*> FeatureProviderMap;