Check for NULL extension_service and extension_process_map for Android platform

chrome/browser/memory_details.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/memory_details.h"
 
 #include "base/bind.h"
 #include "base/file_version_info.h"
 #include "base/metrics/histogram.h"
 #include "base/process_util.h"
@@ skipping 209 matching lines @@
       // Ignore processes that don't have a connection, such as crashed tabs.
       if (!render_process_host->HasConnection() ||
           process.pid != base::GetProcId(render_process_host->GetHandle())) {
         continue;
       }
       process.type = content::PROCESS_TYPE_RENDERER;
       Profile* profile =
           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
       // process be considered a diagnostics process.
       content::RenderProcessHost::RenderWidgetHostsIterator iter(
           render_process_host->GetRenderWidgetHostsIterator());
       for (; !iter.IsAtEnd(); iter.Advance()) {
         const RenderWidgetHost* widget = iter.GetCurrentValue();
         DCHECK(widget);
         if (!widget || !widget->IsRenderView())
           continue;
 
         RenderViewHost* host =
             RenderViewHost::From(const_cast<RenderWidgetHost*>(widget));
         WebContents* contents = WebContents::FromRenderViewHost(host);
         GURL url;
         if (contents)
           url = contents->GetURL();
         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 =
               extension_process_map->GetExtensionsInProcess(
                   host->GetProcess()->GetID());
           for (std::set<std::string>::iterator iter = extension_ids.begin();
                iter != extension_ids.end(); ++iter) {
             const Extension* extension =
                 extension_service->GetExtensionById(*iter, false);
             if (extension && !extension->is_hosted_app()) {
               process.renderer_type =
                   ProcessMemoryInformation::RENDERER_EXTENSION;
               break;
             }
           }
         }
-        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) {
             string16 title = UTF8ToUTF16(extension->name());
             process.titles.push_back(title);
             process.renderer_type =
                 ProcessMemoryInformation::RENDERER_EXTENSION;
             continue;
           }
         }
@@ skipping 176 matching lines @@
   UMA_HISTOGRAM_COUNTS_100("Memory.PepperPluginProcessCount",
       pepper_plugin_count);
   UMA_HISTOGRAM_COUNTS_100("Memory.RendererProcessCount", renderer_count);
   UMA_HISTOGRAM_COUNTS_100("Memory.WorkerProcessCount", worker_count);
   // TODO(viettrungluu): Do we want separate counts for the other
   // (platform-specific) process types?
 
   int total_sample = static_cast<int>(aggregate_memory / 1000);
   UMA_HISTOGRAM_MEMORY_MB("Memory.Total", total_sample);
 }