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

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

Issue 16286017: Revert 203950 "Remove Activity Log usage of Extension objects" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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: trunk/src/chrome/browser/extensions/event_router.cc
===================================================================
--- trunk/src/chrome/browser/extensions/event_router.cc (revision 203966)
+++ trunk/src/chrome/browser/extensions/event_router.cc (working copy)
@@ -111,8 +111,25 @@
Profile* profile = reinterpret_cast<Profile*>(profile_id);
if (!g_browser_process->profile_manager()->IsValidProfile(profile))
return;
- ActivityLog::GetInstance(profile)->LogEventAction(
- extension_id, event_name, event_args.get(), std::string());
+
+ // 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());
+ }
+ }
}
}

Powered by Google App Engine
This is Rietveld 408576698