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

chrome/browser/favicon/favicon_handler_unittest.cc

Index: chrome/browser/favicon/favicon_handler_unittest.cc
===================================================================
--- chrome/browser/favicon/favicon_handler_unittest.cc	(revision 115900)
+++ chrome/browser/favicon/favicon_handler_unittest.cc	(working copy)
@@ -14,6 +14,8 @@
 
 class TestFaviconHandler;
 
+using content::NavigationEntry;
+
 namespace {
 
 // Fill the given bmp with valid png data.
@@ -134,7 +136,7 @@
       : tab_contents_(tab_contents) {
   }
 
-  virtual content::NavigationEntry* GetActiveEntry() {
+  virtual NavigationEntry* GetActiveEntry() {
     ADD_FAILURE() << "TestFaviconHandlerDelegate::GetActiveEntry() "
                   << "should never be called in tests.";
     return NULL;
@@ -163,7 +165,7 @@
                      Type type)
       : FaviconHandler(profile, delegate, type),
         download_image_size_(0),
-        entry_(content::NavigationEntry::Create()),
+        entry_(NavigationEntry::Create()),
         download_id_(0) {
     entry_->SetURL(page_url);
   }
@@ -189,7 +191,7 @@
     download_handler_.reset(download_handler);
   }
 
-  virtual content::NavigationEntry* GetEntry() {
+  virtual NavigationEntry* GetEntry() {
     return entry_.get();
   }
 
@@ -273,7 +275,7 @@
   int download_image_size_;
 
  private:
-  scoped_ptr<content::NavigationEntry> entry_;
+  scoped_ptr<NavigationEntry> entry_;
 
   // The unique id of a download request. It will be returned to a
   // FaviconHandler.