Rename NavigationController to NavigationControllerImpl and put it into the content namespace. Al...

chrome/browser/memory_details.cc

 // Copyright (c) 2011 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 17 matching lines @@
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 #include "content/browser/renderer_host/render_sandbox_host_linux.h"
 #include "content/browser/zygote_host_linux.h"
 #endif
 
 using content::BrowserThread;
+using content::NavigationEntry;
 
 // static
 std::string ProcessMemoryInformation::GetRendererTypeNameInEnglish(
     RendererProcessType type) {
   switch (type) {
     case RENDERER_NORMAL:
       return "Tab";
     case RENDERER_CHROME:
       return "Tab (Chrome)";
     case RENDERER_EXTENSION:
@@ skipping 229 matching lines @@
         // see if it's a chrome://memory URL (we don't want to count these in
         // the total memory usage of the browser).
         //
         // When we reach here, chrome://memory will be the pending entry since
         // we haven't responded with any data such that it would be committed.
         // If you have another chrome://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 content::NavigationEntry* pending_entry =
+        const NavigationEntry* pending_entry =
             contents->GetController().GetPendingEntry();
-        const content::NavigationEntry* last_committed_entry =
+        const NavigationEntry* last_committed_entry =
             contents->GetController().GetLastCommittedEntry();
         if ((last_committed_entry &&
              LowerCaseEqualsASCII(last_committed_entry->GetVirtualURL().spec(),
                                   chrome::kChromeUIMemoryURL)) ||
             (pending_entry &&
              LowerCaseEqualsASCII(pending_entry->GetVirtualURL().spec(),
                                   chrome::kChromeUIMemoryURL)))
           process.is_diagnostics = true;
       }
     }
@@ skipping 120 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);
 }