Index: chrome/browser/memory_details.cc |
diff --git a/chrome/browser/memory_details.cc b/chrome/browser/memory_details.cc |
index 8c3a6c2c075c94424e095009bcd7d021ae906d10..86fd7630ff2c2f215471164c3494dd1c3aae5d8f 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. |
+ if (extension_service != NULL) |
jam
2012/10/03 21:00:13
nit: chrome style is to skip the "!= NULL"
whywhat
2012/10/04 09:58:31
Done.
|
+ 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 != NULL && |
jam
2012/10/03 21:00:13
ditto (also below)
whywhat
2012/10/04 09:58:31
Done.
|
+ 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 != NULL && |
+ extension_process_map->Contains(host->GetProcess()->GetID())) { |
const Extension* extension = |
extension_service->extensions()->GetByID(url.host()); |
if (extension) { |