| Index: chrome/browser/renderer_host/chrome_render_message_filter.cc
|
| diff --git a/chrome/browser/renderer_host/chrome_render_message_filter.cc b/chrome/browser/renderer_host/chrome_render_message_filter.cc
|
| index 5b6a546d2b7185d03159458e92e48b22659a86c0..250249c1d7517ddce0698da18ff1483d66357eba 100644
|
| --- a/chrome/browser/renderer_host/chrome_render_message_filter.cc
|
| +++ b/chrome/browser/renderer_host/chrome_render_message_filter.cc
|
| @@ -83,9 +83,15 @@ void AddAPIActionToExtensionActivityLog(
|
| extensions::ActivityLog::GetInstance(profile);
|
| if (activity_log->IsLogEnabled()) {
|
| if (call_type == ACTIVITYAPI)
|
| - activity_log->LogAPIAction(extension, api_call, args.get(), extra);
|
| + activity_log->LogAPIAction(extension->id(),
|
| + api_call,
|
| + args.get(),
|
| + extra);
|
| else if (call_type == ACTIVITYEVENT)
|
| - activity_log->LogEventAction(extension, api_call, args.get(), extra);
|
| + activity_log->LogEventAction(extension->id(),
|
| + api_call,
|
| + args.get(),
|
| + extra);
|
| }
|
| }
|
| }
|
| @@ -106,7 +112,7 @@ void AddBlockedActionToExtensionActivityLog(
|
| extensions::ActivityLog::GetInstance(profile);
|
| if (activity_log->IsLogEnabled()) {
|
| scoped_ptr<ListValue> empty_args(new ListValue());
|
| - activity_log->LogBlockedAction(extension,
|
| + activity_log->LogBlockedAction(extension->id(),
|
| api_call,
|
| empty_args.get(),
|
| extensions::BlockedAction::ACCESS_DENIED,
|
| @@ -140,7 +146,7 @@ void AddDOMActionToExtensionActivityLog(
|
| extensions::ActivityLog* activity_log =
|
| extensions::ActivityLog::GetInstance(profile);
|
| if (activity_log->IsLogEnabled())
|
| - activity_log->LogDOMAction(extension, url, url_title,
|
| + activity_log->LogDOMAction(extension->id(), url, url_title,
|
| api_call, args.get(), extra);
|
| }
|
| }
|
|
|