Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1099)

Unified Diff: chrome/browser/extensions/event_router.cc

Issue 15686007: Remove Activity Log usage of Extension objects (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added removed code back to see if that fixes persistent memory errors Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/event_router.cc
diff --git a/chrome/browser/extensions/event_router.cc b/chrome/browser/extensions/event_router.cc
index 8674a3c3d4810afabcce04e9dfbcd07626519c80..1f363dde0dc2b59c0c185a0bb8f6565f0b62d0d4 100644
--- a/chrome/browser/extensions/event_router.cc
+++ b/chrome/browser/extensions/event_router.cc
@@ -111,25 +111,8 @@ void EventRouter::LogExtensionEventMessage(void* profile_id,
Profile* profile = reinterpret_cast<Profile*>(profile_id);
if (!g_browser_process->profile_manager()->IsValidProfile(profile))
return;
-
- // An ExtensionService might not be running during unit tests, or an
- // extension might have been unloaded by the time we get to logging it. In
- // those cases log a warning.
- ExtensionService* extension_service =
- ExtensionSystem::Get(profile)->extension_service();
- if (!extension_service) {
- LOG(WARNING) << "ExtensionService does not seem to be available "
- << "(this may be normal for unit tests)";
- } else {
- const Extension* extension =
- extension_service->extensions()->GetByID(extension_id);
- if (!extension) {
- LOG(WARNING) << "Extension " << extension_id << " not found!";
- } else {
- ActivityLog::GetInstance(profile)->LogEventAction(
- extension, event_name, event_args.get(), std::string());
- }
- }
+ ActivityLog::GetInstance(profile)->LogEventAction(
+ extension_id, event_name, event_args.get(), std::string());
}
}

Powered by Google App Engine
This is Rietveld 408576698