Enable extension APIs for content scripts.

chrome/browser/extensions/extension_function_dispatcher.cc

Index: chrome/browser/extensions/extension_function_dispatcher.cc
diff --git a/chrome/browser/extensions/extension_function_dispatcher.cc b/chrome/browser/extensions/extension_function_dispatcher.cc
index 4d0c94bd4bf9cd32f08c550c87744faaecc426a1..5a8f39881f59ae95577e2b956373d33d028543a8 100644
--- a/chrome/browser/extensions/extension_function_dispatcher.cc
+++ b/chrome/browser/extensions/extension_function_dispatcher.cc
@@ -51,6 +51,7 @@
 #include "chrome/browser/extensions/extension_webrequest_api.h"
 #include "chrome/browser/extensions/extension_webstore_private_api.h"
 #include "chrome/browser/extensions/extensions_quota_service.h"
+#include "chrome/browser/extensions/process_map.h"
 #include "chrome/browser/extensions/speech_input/extension_speech_input_api.h"
 #include "chrome/browser/external_protocol/external_protocol_handler.h"
 #include "chrome/browser/history/history_extension_api.h"
@@ -61,6 +62,7 @@
 #include "chrome/browser/rlz/rlz_extension_api.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
+#include "chrome/common/extensions/api/extension_api.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/renderer_host/render_view_host.h"
@@ -84,6 +86,8 @@
 #include "chrome/browser/extensions/extension_mediaplayer_private_api.h"
 #endif
 
+using extensions::ExtensionAPI;
+
 // FactoryRegistry -------------------------------------------------------------
 
 namespace {
@@ -525,7 +529,7 @@ void ExtensionFunctionDispatcher::DispatchOnIOThread(
     int routing_id,
     const ExtensionHostMsg_Request_Params& params) {
   const Extension* extension =
-      extension_info_map->extensions().GetByURL(params.source_url);
+      extension_info_map->extensions().GetByID(params.extension_id);
 
   scoped_refptr<ExtensionFunction> function(
       CreateExtensionFunction(params, extension, render_process_id,
@@ -597,9 +601,8 @@ void ExtensionFunctionDispatcher::Dispatch(
   if (!service || !process_map)
     return;
 
-  // TODO(aa): When we allow content scripts to call extension APIs, we will
-  // have to pass the extension ID explicitly here, not use the source URL.
-  const Extension* extension = service->GetExtensionByURL(params.source_url);
+  const Extension* extension = service->GetExtensionById(
+      params.extension_id, false);
   if (!extension)
     extension = service->GetExtensionByWebExtent(params.source_url);
 
@@ -650,7 +653,11 @@ ExtensionFunction* ExtensionFunctionDispatcher::CreateExtensionFunction(
     return NULL;
   }
 
-  if (!process_map.Contains(extension->id(), requesting_process_id)) {
+  if (!process_map.Contains(extension->id(), requesting_process_id))

[Matt Perry, 2011/11/11 20:07:19]

did you mean to remove this?

[Aaron Boodman, 2011/11/11 23:12:02]

Yes, merge failure. Thanks.

+    return false;
+
+  if (!ExtensionAPI::GetInstance()->IsFullNameUnprivileged(params.name) &&
+      !process_map.Contains(extension->id(), requesting_process_id)) {
     LOG(ERROR) << "Extension API called from incorrect process "
                << requesting_process_id
                << " from URL " << params.source_url.spec();