Clean up some style and organization in the browser about handler. No code...

chrome/browser/memory_details.cc

 // Copyright (c) 2006-2008 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 <psapi.h>
 
 #include "base/file_version_info.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
+#include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/common/child_process_host.h"
+#include "chrome/common/url_constants.h"
 
 class RenderViewHostDelegate;
 
 // Template of static data we use for finding browser process information.
 // These entries must match the ordering for MemoryDetails::BrowserProcess.
 static ProcessData g_process_template[] = {
     { L"Chromium", L"chrome.exe", },
     { L"IE", L"iexplore.exe", },
     { L"Firefox", L"firefox.exe", },
     { L"Opera", L"opera.exe", },
@@ skipping 148 matching lines @@
 
 void MemoryDetails::CollectChildInfoOnUIThread() {
   DCHECK(MessageLoop::current() == ui_loop_);
 
   // Get more information about the process.
   for (size_t index = 0; index < process_data_[CHROME_BROWSER].processes.size();
       index++) {
     // Check if it's a renderer, if so get the list of page titles in it and
     // check if it's a diagnostics-related process.  We skip all diagnostics
     // pages (e.g. "about:xxx" URLs).  Iterate the RenderProcessHosts to find
-    // the tab contents.  If it is of type TAB_CONTENTS_ABOUT_UI, mark the
-    // process as diagnostics related.
+    // the tab contents.
     RenderProcessHost::iterator renderer_iter;
     for (renderer_iter = RenderProcessHost::begin(); renderer_iter !=
          RenderProcessHost::end(); ++renderer_iter) {
       DCHECK(renderer_iter->second);
       ProcessMemoryInformation& process =
           process_data_[CHROME_BROWSER].processes[index];
       if (process.pid != renderer_iter->second->process().pid())
         continue;
       process.type = ChildProcessInfo::RENDER_PROCESS;
       // The RenderProcessHost may host multiple TabContents.  Any
@@ skipping 15 matching lines @@
         RenderViewHost* host = static_cast<RenderViewHost*>(widget);
         TabContents* contents = NULL;
         if (host->delegate())
           contents = host->delegate()->GetAsWebContents();
         if (!contents)
           continue;
         std::wstring title = UTF16ToWideHack(contents->GetTitle());
         if (!title.length())
           title = L"Untitled";
         process.titles.push_back(title);
-        if (contents->type() == TAB_CONTENTS_ABOUT_UI)
+
+        // We need to check the pending entry as well as the pending entry to
+        // see if it's an about:memory URL (we don't want to count these in the
+        // total memory usage of the browser).
+        //
+        // When we reach here, about:memory will be the pending entry since we
+        // haven't responded with any data such that it would be committed. If
+        // you have another about:memory tab open (which would be committed),
+        // we don't want to count it either, so we also check the last committed
+        // entry.
+        //
+        // Either the pending or last committed entries can be NULL.
+        const NavigationEntry* pending_entry = NULL;
+            //contents->controller()->GetPendingEntry();
+        const NavigationEntry* last_committed_entry =
+            contents->controller()->GetLastCommittedEntry();
+        if ((last_committed_entry &&
+             LowerCaseEqualsASCII(last_committed_entry->display_url().spec(), 
+                                  chrome::kAboutMemoryURL)) ||
+            (pending_entry &&
+             LowerCaseEqualsASCII(pending_entry->display_url().spec(), 
+                                  chrome::kAboutMemoryURL)))
           process.is_diagnostics = true;
       }
     }
   }
 
   // Get rid of other Chrome processes that are from a different profile.
   for (size_t index = 0; index < process_data_[CHROME_BROWSER].processes.size();
       index++) {
     if (process_data_[CHROME_BROWSER].processes[index].type ==
         ChildProcessInfo::UNKNOWN_PROCESS) {
@@ skipping 38 matching lines @@
   }
 
   UMA_HISTOGRAM_COUNTS_100("Memory.ProcessCount",
       static_cast<int>(browser.processes.size()));
   UMA_HISTOGRAM_COUNTS_100("Memory.PluginProcessCount", plugin_count);
   UMA_HISTOGRAM_COUNTS_100("Memory.WorkerProcessCount", worker_count);
 
   int total_sample = static_cast<int>(aggregate_memory / 1000);
   UMA_HISTOGRAM_MEMORY_MB("Memory.Total", total_sample);
 }