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

Unified Diff: chrome/browser/extensions/api/web_request/web_request_api.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/api/web_request/web_request_api.cc
diff --git a/chrome/browser/extensions/api/web_request/web_request_api.cc b/chrome/browser/extensions/api/web_request/web_request_api.cc
index ef1b2fb86be69c29ddd7d13cd7f54f0df77089de..401741f67cbe4710763c6b178528c85c01f23417 100644
--- a/chrome/browser/extensions/api/web_request/web_request_api.cc
+++ b/chrome/browser/extensions/api/web_request/web_request_api.cc
@@ -1602,28 +1602,12 @@ void LogExtensionActivity(Profile* profile,
api_call,
details.release()));
} else {
- // An ExtensionService might not be running during unit tests, or an
- // extension might have been unloadd by the time we get to logging it. In
- // those cases log a warning.
- ExtensionService* extension_service =
- extensions::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 {
- extensions::ActivityLog::GetInstance(profile)->LogWebRequestAction(
- extension,
- url,
- api_call,
- details.Pass(),
- "");
- }
- }
+ extensions::ActivityLog::GetInstance(profile)->LogWebRequestAction(
+ extension_id,
+ url,
+ api_call,
+ details.Pass(),
+ "");
}
}
« no previous file with comments | « chrome/browser/extensions/activity_log/activity_log_unittest.cc ('k') | chrome/browser/extensions/event_router.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698