Revert 184837

chrome/common/extensions/api/extension_api.h

 // 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.
 
 #ifndef CHROME_COMMON_EXTENSIONS_API_EXTENSION_API_H_
 #define CHROME_COMMON_EXTENSIONS_API_EXTENSION_API_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 70 matching lines @@
   // content scripts, or other low-privileged contexts.
   bool IsPrivileged(const std::string& name);
 
   // Gets the schema for the extension API with namespace |full_name|.
   // Ownership remains with this object.
   const base::DictionaryValue* GetSchema(const std::string& full_name);
 
   // Gets the APIs available to |context| given an |extension| and |url|. The
   // extension or URL may not be relevant to all contexts, and may be left
   // NULL/empty.
-  std::set<std::string> GetAPIsForContext(
+  scoped_ptr<std::set<std::string> > GetAPIsForContext(
       Feature::Context context, const Extension* extension, const GURL& url);
 
-  std::set<std::string> GetAllAPINames();
-
   // Gets a Feature object describing the API with the specified |full_name|.
   // This can be either an API namespace (like history, or
   // experimental.bookmarks), or it can be an individual function or event.
   virtual Feature* GetFeature(const std::string& full_name) OVERRIDE;
 
   // Splits a full name from the extension API into its API and child name
   // parts. Some examples:
   //
   // "bookmarks.create" -> ("bookmarks", "create")
   // "experimental.input.ui.cursorUp" -> ("experimental.input.ui", "cursorUp")
@@ skipping 47 matching lines @@
   // "extension" which has unprivileged components.
   void RemovePrivilegedAPIs(std::set<std::string>* apis);
 
   // Adds an APIs that match |url| to |out|.
   // NOTE: This only works for non-feature-controlled APIs.
   // TODO(aa): Remove this when all APIs are converted to the feature system.
   void GetAPIsMatchingURL(const GURL& url, std::set<std::string>* out);
 
   // Map from each API that hasn't been loaded yet to the schema which defines
   // it. Note that there may be multiple APIs per schema.
-  typedef std::map<std::string, base::StringPiece> UnloadedSchemaMap;
-  UnloadedSchemaMap unloaded_schemas_;
+  std::map<std::string, base::StringPiece> unloaded_schemas_;
 
   // Schemas for each namespace.
   typedef std::map<std::string, linked_ptr<const DictionaryValue> > SchemaMap;
   SchemaMap schemas_;
 
   // APIs that are entirely unprivileged.
   std::set<std::string> completely_unprivileged_apis_;
 
   // APIs that are not entirely unprivileged, but have unprivileged components.
   std::set<std::string> partially_unprivileged_apis_;
 
   // 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_;
 
   // FeatureProviders used for resolving dependencies.
   typedef std::map<std::string, FeatureProvider*> FeatureProviderMap;
   FeatureProviderMap dependency_providers_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionAPI);
 };
 
 }  // extensions
 
 #endif  // CHROME_COMMON_EXTENSIONS_API_EXTENSION_API_H_