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

Unified Diff: chrome/browser/memory_details.cc

Issue 11013031: Check for NULL extension_service and extension_process_map for Android platform (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Synced Created 8 years, 2 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/memory_details.cc
diff --git a/chrome/browser/memory_details.cc b/chrome/browser/memory_details.cc
index 8c3a6c2c075c94424e095009bcd7d021ae906d10..c8bdc9d0190d5ea9ac936683c2f0c9a0ce7859ad 100644
--- a/chrome/browser/memory_details.cc
+++ b/chrome/browser/memory_details.cc
@@ -227,8 +227,10 @@ void MemoryDetails::CollectChildInfoOnUIThread() {
Profile::FromBrowserContext(
render_process_host->GetBrowserContext());
ExtensionService* extension_service = profile->GetExtensionService();
- extensions::ProcessMap* extension_process_map =
- extension_service->process_map();
+ extensions::ProcessMap* extension_process_map = NULL;
+ // No extensions on Android. So extension_service can be NULL.
+ if (extension_service)
+ extension_process_map = extension_service->process_map();
// The RenderProcessHost may host multiple WebContentses. Any
// of them which contain diagnostics information make the whole
@@ -250,8 +252,8 @@ void MemoryDetails::CollectChildInfoOnUIThread() {
chrome::ViewType type = chrome::GetViewType(contents);
if (host->GetEnabledBindings() & content::BINDINGS_POLICY_WEB_UI) {
process.renderer_type = ProcessMemoryInformation::RENDERER_CHROME;
- } else if (extension_process_map->Contains(
- host->GetProcess()->GetID())) {
+ } else if (extension_process_map &&
+ extension_process_map->Contains(host->GetProcess()->GetID())) {
// For our purposes, don't count processes containing only hosted apps
// as extension processes. See also: crbug.com/102533.
std::set<std::string> extension_ids =
@@ -268,7 +270,8 @@ void MemoryDetails::CollectChildInfoOnUIThread() {
}
}
}
- if (extension_process_map->Contains(host->GetProcess()->GetID())) {
+ if (extension_process_map &&
+ extension_process_map->Contains(host->GetProcess()->GetID())) {
const Extension* extension =
extension_service->extensions()->GetByID(url.host());
if (extension) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698