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

chrome/browser/favicon/favicon_handler.cc

Index: chrome/browser/favicon/favicon_handler.cc
===================================================================
--- chrome/browser/favicon/favicon_handler.cc	(revision 115900)
+++ chrome/browser/favicon/favicon_handler.cc	(working copy)
@@ -21,6 +21,8 @@
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_util.h"
 
+using content::NavigationEntry;
+
 namespace {
 
 // Returns history::IconType the given icon_type corresponds to.
@@ -140,20 +142,20 @@
   }
 
   if (url == url_ && icon_type == history::FAVICON) {
-    content::NavigationEntry* entry = GetEntry();
+    NavigationEntry* entry = GetEntry();
     if (entry)
       UpdateFavicon(entry, &sized_image);
   }
 }
 
-void FaviconHandler::UpdateFavicon(content::NavigationEntry* entry,
+void FaviconHandler::UpdateFavicon(NavigationEntry* entry,
                                    scoped_refptr<RefCountedMemory> data) {
   scoped_ptr<gfx::Image> image(gfx::ImageFromPNGEncodedData(data->front(),
                                                             data->size()));
   UpdateFavicon(entry, image.get());
 }
 
-void FaviconHandler::UpdateFavicon(content::NavigationEntry* entry,
+void FaviconHandler::UpdateFavicon(NavigationEntry* entry,
                                    const gfx::Image* image) {
   // No matter what happens, we need to mark the favicon as being set.
   entry->GetFavicon().valid = true;
@@ -168,7 +170,7 @@
 void FaviconHandler::OnUpdateFaviconURL(
     int32 page_id,
     const std::vector<FaviconURL>& candidates) {
-  content::NavigationEntry* entry = GetEntry();
+  NavigationEntry* entry = GetEntry();
   if (!entry)
     return;
 
@@ -245,8 +247,8 @@
   download_requests_.erase(i);
 }
 
-content::NavigationEntry* FaviconHandler::GetEntry() {
-  content::NavigationEntry* entry = delegate_->GetActiveEntry();
+NavigationEntry* FaviconHandler::GetEntry() {
+  NavigationEntry* entry = delegate_->GetActiveEntry();
   if (entry && entry->GetURL() == url_)
     return entry;
 
@@ -313,7 +315,7 @@
 void FaviconHandler::OnFaviconDataForInitialURL(
     FaviconService::Handle handle,
     history::FaviconData favicon) {
-  content::NavigationEntry* entry = GetEntry();
+  NavigationEntry* entry = GetEntry();
   if (!entry)
     return;
 
@@ -390,7 +392,7 @@
 
 void FaviconHandler::OnFaviconData(FaviconService::Handle handle,
                                   history::FaviconData favicon) {
-  content::NavigationEntry* entry = GetEntry();
+  NavigationEntry* entry = GetEntry();
   if (!entry)
     return;