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

chrome/browser/favicon/favicon_handler_unittest.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/favicon/favicon_handler.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "content/browser/tab_contents/test_tab_contents.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/favicon_status.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/favicon_size.h"
 #include "ui/gfx/image/image.h"
 
 class TestFaviconHandler;
 
+using content::NavigationEntry;
+
 namespace {
 
 // Fill the given bmp with valid png data.
 void FillDataToBitmap(int w, int h, SkBitmap* bmp) {
   bmp->setConfig(SkBitmap::kARGB_8888_Config, w, h);
   bmp->allocPixels();
 
   unsigned char* src_data =
       reinterpret_cast<unsigned char*>(bmp->getAddr32(0, 0));
   for (int i = 0; i < w * h; i++) {
@@ skipping 100 matching lines @@
 // the various delegate methods.  Most of these methods are actually never
 // called.
 // TODO(rohitrao): Refactor the tests to override these delegate methods instead
 // of subclassing.
 class TestFaviconHandlerDelegate : public FaviconHandlerDelegate {
  public:
   explicit TestFaviconHandlerDelegate(TabContents* tab_contents)
       : tab_contents_(tab_contents) {
   }
 
-  virtual content::NavigationEntry* GetActiveEntry() {
+  virtual NavigationEntry* GetActiveEntry() {
     ADD_FAILURE() << "TestFaviconHandlerDelegate::GetActiveEntry() "
                   << "should never be called in tests.";
     return NULL;
   }
 
   virtual void StartDownload(int id, const GURL& url, int image_size) {
     ADD_FAILURE() << "TestFaviconHandlerDelegate::StartDownload() "
                   << "should never be called in tests.";
   }
 
   virtual void NotifyFaviconUpdated() {
     tab_contents_->NotifyNavigationStateChanged(TabContents::INVALIDATE_TAB);
   }
 
  private:
   TabContents* tab_contents_;  // weak
 };
 
 // This class is used to catch the FaviconHandler's download and history
 // request, and also provide the methods to access the FaviconHandler internal.
 class TestFaviconHandler : public FaviconHandler {
  public:
   TestFaviconHandler(const GURL& page_url,
                      Profile* profile,
                      FaviconHandlerDelegate* delegate,
                      Type type)
       : FaviconHandler(profile, delegate, type),
         download_image_size_(0),
-        entry_(content::NavigationEntry::Create()),
+        entry_(NavigationEntry::Create()),
         download_id_(0) {
     entry_->SetURL(page_url);
   }
 
   virtual ~TestFaviconHandler() {
   }
 
   HistoryRequestHandler* history_handler() {
     return history_handler_.get();
   }
 
   // This method will take the ownership of the given handler.
   void set_history_handler(HistoryRequestHandler* handler) {
     history_handler_.reset(handler);
   }
 
   DownloadHandler* download_handler() {
     return download_handler_.get();
   }
 
   // This method will take the ownership of the given download_handler.
   void set_download_handler(DownloadHandler* download_handler) {
     download_handler_.reset(download_handler);
   }
 
-  virtual content::NavigationEntry* GetEntry() {
+  virtual NavigationEntry* GetEntry() {
     return entry_.get();
   }
 
   const std::vector<FaviconURL>& urls() {
     return urls_;
   }
 
   void FetchFavicon(const GURL& url) {
     FaviconHandler::FetchFavicon(url);
   }
@@ skipping 63 matching lines @@
   virtual bool ShouldSaveFavicon(const GURL& url) OVERRIDE {
     return true;
   }
 
   GURL page_url_;
 
   GURL download_image_url_;
   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.
   int download_id_;
 
   scoped_ptr<DownloadHandler> download_handler_;
   scoped_ptr<HistoryRequestHandler> history_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(TestFaviconHandler);
 };
@@ skipping 528 matching lines @@
   FillBitmap(gfx::kFaviconSize, gfx::kFaviconSize, &data->data());
   handler->favicon_data_.image_data = data;
 
   handler->InvokeCallback();
 
   // No download request.
   EXPECT_FALSE(helper.download_handler());
 }
 
 }  // namespace.