Reland r130462: Implement FeatureProvider for ExtensionAPI."

chrome/renderer/extensions/extension_dispatcher.cc

Index: chrome/renderer/extensions/extension_dispatcher.cc
diff --git a/chrome/renderer/extensions/extension_dispatcher.cc b/chrome/renderer/extensions/extension_dispatcher.cc
index 3e8af8d95b04002400dbddaefedffc14f9cbcfb8..603cd69dccd12dcdc6962a7a036f537db57b4c2f 100644
--- a/chrome/renderer/extensions/extension_dispatcher.cc
+++ b/chrome/renderer/extensions/extension_dispatcher.cc
@@ -576,7 +576,7 @@ void ExtensionDispatcher::DidCreateScriptContext(
       // correct APIs, however, until it doesn't have a 2MB overhead we can't
       // load it in every process.
       scoped_ptr<std::set<std::string> > apis =
-        ExtensionAPI::GetInstance()->GetAPIsForContext(
+        ExtensionAPI::GetSharedInstance()->GetAPIsForContext(
             context_type, extension, url_info.url());
       for (std::set<std::string>::iterator i = apis->begin(); i != apis->end();
           ++i) {
@@ -834,7 +834,7 @@ bool ExtensionDispatcher::CheckCurrentContextAccessToExtensionAPI(
   }
 
   if (!IsExtensionActive(extension->id()) &&
-      ExtensionAPI::GetInstance()->IsPrivileged(function_name)) {
+      ExtensionAPI::GetSharedInstance()->IsPrivileged(function_name)) {
     static const char kMessage[] =
         "%s can only be used in an extension process.";
     std::string error_msg = base::StringPrintf(kMessage, function_name.c_str());