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..5ee3cd3f3647525edd99fef6364679d114b63666 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/.
@@ -175,9 +176,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;