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

chrome/browser/extensions/extension_function_dispatcher.cc

 // 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.
 
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 
 #include <map>
 
 #include "base/json/json_string_value_serializer.h"
 #include "base/lazy_instance.h"
 #include "base/memory/ref_counted.h"
 #include "base/process_util.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "chrome/browser/extensions/extension_activity_log.h"
 #include "chrome/browser/extensions/extension_function.h"
 #include "chrome/browser/extensions/extension_function_registry.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_web_ui.h"
 #include "chrome/browser/extensions/extensions_quota_service.h"
 #include "chrome/browser/extensions/process_map.h"
 #include "chrome/browser/external_protocol/external_protocol_handler.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_host/chrome_render_message_filter.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/extensions/extension_set.h"
+#include "chrome/common/extensions/feature.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_message_macros.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "webkit/glue/resource_type.h"
 
 using extensions::ExtensionAPI;
+using extensions::Feature;
 using content::RenderViewHost;
 using WebKit::WebSecurityOrigin;
 
 namespace {
 
 const char kAccessDenied[] = "access denied";
 const char kQuotaExceeded[] = "quota exceeded";
 
 void LogSuccess(const Extension* extension,
                 const ExtensionHostMsg_Request_Params& params) {
@@ skipping 215 matching lines @@
     extensions::ExtensionAPI* api,
     void* profile,
     IPC::Message::Sender* ipc_sender,
     int routing_id) {
   if (!extension) {
     LOG(ERROR) << "Specified extension does not exist.";
     SendAccessDenied(ipc_sender, routing_id, params.request_id);
     return NULL;
   }
 
+  // If the API has been ported to the feature system, use that.
+  if (api->GetFeature(params.name)) {
+    if (!api->IsAvailable(
+            params.name,
+            extension,
+            static_cast<Feature::Context>(params.source_context_type))) {
+      LOG(ERROR) << "Access to extension API '" << params.name << "' denied.";

[Matt Perry, 2012/04/09 20:55:54]

SendAccessDenied? this if body should be identical to the older one.

+      return NULL;
+    }
+  } else {
+    // Otherwise, fall back to the older system.
+    if (!extension->HasAPIPermission(params.name)) {
+      LOG(ERROR) << "Extension " << extension->id() << " does not have "
+                 << "permission to function: " << params.name;
+      SendAccessDenied(ipc_sender, routing_id, params.request_id);
+      return NULL;
+    }
+  }
+
+  // If the API requires a privileged process, ensure it is in one.
   if (api->IsPrivileged(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();
     SendAccessDenied(ipc_sender, routing_id, params.request_id);
     return NULL;
   }
 
-  if (!extension->HasAPIPermission(params.name)) {
-    LOG(ERROR) << "Extension " << extension->id() << " does not have "
-               << "permission to function: " << params.name;
-    SendAccessDenied(ipc_sender, routing_id, params.request_id);
-    return NULL;
-  }
-
   ExtensionFunction* function =
       ExtensionFunctionRegistry::GetInstance()->NewFunction(params.name);
   function->SetArgs(&params.arguments);
   function->set_source_url(params.source_url);
   function->set_request_id(params.request_id);
   function->set_has_callback(params.has_callback);
   function->set_user_gesture(params.user_gesture);
   function->set_extension(extension);
   function->set_profile_id(profile);
   return function;
 }
 
 // static
 void ExtensionFunctionDispatcher::SendAccessDenied(
     IPC::Message::Sender* ipc_sender, int routing_id, int request_id) {
   ipc_sender->Send(new ExtensionMsg_Response(
       routing_id, request_id, false, std::string(),
       "Access to extension API denied."));
 }