Revert 203950 "Remove Activity Log usage of Extension objects"

trunk/src/chrome/browser/extensions/extension_function_dispatcher.cc

Index: trunk/src/chrome/browser/extensions/extension_function_dispatcher.cc
===================================================================
--- trunk/src/chrome/browser/extensions/extension_function_dispatcher.cc	(revision 203966)
+++ trunk/src/chrome/browser/extensions/extension_function_dispatcher.cc	(working copy)
@@ -46,7 +46,7 @@
 
 namespace {
 
-void LogSuccess(const std::string& extension_id,
+void LogSuccess(const Extension* extension,
                 const std::string& api_name,
                 scoped_ptr<ListValue> args,
                 Profile* profile) {
@@ -56,19 +56,18 @@
     BrowserThread::PostTask(BrowserThread::UI,
                             FROM_HERE,
                             base::Bind(&LogSuccess,
-                                       extension_id,
+                                       extension,
                                        api_name,
                                        base::Passed(&args),
                                        profile));
   } else {
     extensions::ActivityLog* activity_log =
         extensions::ActivityLog::GetInstance(profile);
-    activity_log->LogAPIAction(
-        extension_id, api_name, args.get(), std::string());
+    activity_log->LogAPIAction(extension, api_name, args.get(), std::string());
   }
 }
 
-void LogFailure(const std::string& extension_id,
+void LogFailure(const Extension* extension,
                 const std::string& api_name,
                 scoped_ptr<ListValue> args,
                 extensions::BlockedAction::Reason reason,
@@ -79,7 +78,7 @@
     BrowserThread::PostTask(BrowserThread::UI,
                             FROM_HERE,
                             base::Bind(&LogFailure,
-                                       extension_id,
+                                       extension,
                                        api_name,
                                        base::Passed(&args),
                                        reason,
@@ -88,7 +87,7 @@
     extensions::ActivityLog* activity_log =
         extensions::ActivityLog::GetInstance(profile);
     activity_log->LogBlockedAction(
-        extension_id, api_name, args.get(), reason, std::string());
+        extension, api_name, args.get(), reason, std::string());
   }
 }
 
@@ -265,7 +264,7 @@
   scoped_ptr<ListValue> args(params.arguments.DeepCopy());
 
   if (!function.get()) {
-    LogFailure(extension->id(),
+    LogFailure(extension,
                params.name,
                args.Pass(),
                extensions::BlockedAction::ACCESS_DENIED,
@@ -285,7 +284,7 @@
       extension_info_map->IsIncognitoEnabled(extension->id()));
 
   if (!CheckPermissions(function.get(), extension, params, callback)) {
-    LogFailure(extension->id(),
+    LogFailure(extension,
                params.name,
                args.Pass(),
                extensions::BlockedAction::ACCESS_DENIED,
@@ -299,13 +298,13 @@
                                               &params.arguments,
                                               base::TimeTicks::Now());
   if (violation_error.empty()) {
-    LogSuccess(extension->id(),
+    LogSuccess(extension,
                params.name,
                args.Pass(),
                profile_cast);
     function->Run();
   } else {
-    LogFailure(extension->id(),
+    LogFailure(extension,
                params.name,
                args.Pass(),
                extensions::BlockedAction::QUOTA_EXCEEDED,
@@ -370,7 +369,7 @@
   scoped_ptr<ListValue> args(params.arguments.DeepCopy());
 
   if (!function.get()) {
-    LogFailure(extension->id(),
+    LogFailure(extension,
                params.name,
                args.Pass(),
                extensions::BlockedAction::ACCESS_DENIED,
@@ -390,7 +389,7 @@
   function->set_include_incognito(service->CanCrossIncognito(extension));
 
   if (!CheckPermissions(function.get(), extension, params, callback)) {
-    LogFailure(extension->id(),
+    LogFailure(extension,
                params.name,
                args.Pass(),
                extensions::BlockedAction::ACCESS_DENIED,
@@ -406,10 +405,10 @@
   if (violation_error.empty()) {
     // See crbug.com/39178.
     ExternalProtocolHandler::PermitLaunchUrl();
-    LogSuccess(extension->id(), params.name, args.Pass(), profile());
+    LogSuccess(extension, params.name, args.Pass(), profile());
     function->Run();
   } else {
-    LogFailure(extension->id(),
+    LogFailure(extension,
                params.name,
                args.Pass(),
                extensions::BlockedAction::QUOTA_EXCEEDED,