[Activity Log] fix logging of blocked API calls

chrome/renderer/extensions/api_activity_logger.h

 // Copyright (c) 2013 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_RENDERER_EXTENSIONS_API_ACTIVITY_LOGGER_H_
 #define CHROME_RENDERER_EXTENSIONS_API_ACTIVITY_LOGGER_H_
 
 #include <string>
+#include "chrome/common/extensions/features/feature.h"
 #include "chrome/renderer/extensions/chrome_v8_extension.h"
 #include "chrome/renderer/extensions/dispatcher.h"
 #include "v8/include/v8.h"
 
 namespace extensions {
 
 // Used to log extension API calls and events that are implemented with custom
 // bindings.The actions are sent via IPC to extensions::ActivityLog for
 // recording and display.
 class APIActivityLogger : public ChromeV8Extension {
  public:
   APIActivityLogger(Dispatcher* dispatcher, ChromeV8Context* context);
 
-  // This is ultimately invoked in schema_generated_bindings.js with
-  // JavaScript arguments. Logged as an APIAction.
+  // This is ultimately invoked in bindings.js with JavaScript arguments.
   //    arg0 - extension ID as a string
   //    arg1 - API call name as a string
   //    arg2 - arguments to the API call
   //    arg3 - any extra logging info as a string (optional)
   static void LogAPICall(const v8::FunctionCallbackInfo<v8::Value>& args);
 
-  // This is ultimately invoked in schema_generated_bindings.js with
-  // JavaScript arguments. Logged as an EventAction.
+  // This is ultimately invoked in bindings.js with JavaScript arguments.
   //    arg0 - extension ID as a string
   //    arg1 - Event name as a string
   //    arg2 - Event arguments
   //    arg3 - any extra logging info as a string (optional)
   static void LogEvent(const v8::FunctionCallbackInfo<v8::Value>& args);
 
-  // This is for the Dispatcher to use to log blocked API calls.
+  // This is invoked in binding.js with JavaScript arguments.
+  //    arg0 - extension ID as string
+  //    arg1 - Function name as a string
+  //    arg2 - Reason for the failure
+  static void LogBlockedCallWrapper(
+      const v8::FunctionCallbackInfo<v8::Value>& args);

[not at google - send to devlin, 2013/07/12 15:53:07]

unrelated comment: do these v8-exposed functions need to be public?

[felt, 2013/07/13 04:38:55]

I thought they had be to work, but it appears they don't -- so I made them
private.

+
+  // This is to use to log blocked API calls.
   static void LogBlockedCall(const std::string& extension_id,
-                             const std::string& function_name);
+                             const std::string& function_name,
+                             Feature::AvailabilityResult result);
 
  private:
    // Used to distinguish API calls & events from each other in LogInternal.
    enum CallType {
      APICALL,
      EVENT
    };
 
    // LogAPICall and LogEvent are really the same underneath except for
    // how they are ultimately dispatched to the log.
    static void LogInternal(const CallType call_type,
                            const v8::FunctionCallbackInfo<v8::Value>& args);
 
   DISALLOW_COPY_AND_ASSIGN(APIActivityLogger);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_RENDERER_EXTENSIONS_API_ACTIVITY_LOGGER_H_