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

chrome/browser/favicon/favicon_tab_helper.cc

Index: chrome/browser/favicon/favicon_tab_helper.cc
===================================================================
--- chrome/browser/favicon/favicon_tab_helper.cc	(revision 115900)
+++ chrome/browser/favicon/favicon_tab_helper.cc	(working copy)
@@ -23,6 +23,7 @@
 #include "ui/gfx/image/image.h"
 
 using content::FaviconStatus;
+using content::NavigationEntry;
 using content::WebContents;
 
 FaviconTabHelper::FaviconTabHelper(TabContents* tab_contents)
@@ -48,7 +49,7 @@
   // Like GetTitle(), we also want to use the favicon for the last committed
   // entry rather than a pending navigation entry.
   const NavigationController& controller = web_contents()->GetController();
-  content::NavigationEntry* entry = controller.GetTransientEntry();
+  NavigationEntry* entry = controller.GetTransientEntry();
   if (entry)
     return entry->GetFavicon().bitmap;
 
@@ -60,7 +61,7 @@
 
 bool FaviconTabHelper::FaviconIsValid() const {
   const NavigationController& controller = web_contents()->GetController();
-  content::NavigationEntry* entry = controller.GetTransientEntry();
+  NavigationEntry* entry = controller.GetTransientEntry();
   if (entry)
     return entry->GetFavicon().valid;
 
@@ -84,8 +85,7 @@
 }
 
 void FaviconTabHelper::SaveFavicon() {
-  content::NavigationEntry* entry =
-      web_contents()->GetController().GetActiveEntry();
+  NavigationEntry* entry = web_contents()->GetController().GetActiveEntry();
   if (!entry || entry->GetURL().is_empty())
     return;
 
@@ -133,7 +133,7 @@
     touch_icon_handler_->OnUpdateFaviconURL(page_id, candidates);
 }
 
-content::NavigationEntry* FaviconTabHelper::GetActiveEntry() {
+NavigationEntry* FaviconTabHelper::GetActiveEntry() {
   return web_contents()->GetController().GetActiveEntry();
 }