Fix a bunch of tiny near-bugs and bugs that static analysis identified...

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"
@@ skipping 201 matching lines @@
         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);
 
-        // We need to check the pending entry as well as the pending entry to
+        // We need to check the pending entry as well as the display_url 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* pending_entry =
+            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;
       }
@@ skipping 46 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);
 }