Linux/ChromeOS Chromium style checker cleanup, chrome/browser edition.

chrome/browser/favicon/favicon_handler_unittest.cc

 // Copyright (c) 2012 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 "base/memory/scoped_ptr.h"
 #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/public/browser/favicon_status.h"
 #include "content/public/browser/invalidate_type.h"
@@ skipping 153 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(WebContents* web_contents)
       : web_contents_(web_contents) {
   }
 
-  virtual NavigationEntry* GetActiveEntry() {
+  virtual NavigationEntry* GetActiveEntry() OVERRIDE {
     ADD_FAILURE() << "TestFaviconHandlerDelegate::GetActiveEntry() "
                   << "should never be called in tests.";
     return NULL;
   }
 
-  virtual int StartDownload(const GURL& url, int image_size) {
+  virtual int StartDownload(const GURL& url, int image_size) OVERRIDE {
     ADD_FAILURE() << "TestFaviconHandlerDelegate::StartDownload() "
                   << "should never be called in tests.";
     return -1;
   }
 
-  virtual void NotifyFaviconUpdated() {
+  virtual void NotifyFaviconUpdated() OVERRIDE {
     web_contents_->NotifyNavigationStateChanged(content::INVALIDATE_TYPE_TAB);
   }
 
  private:
   WebContents* web_contents_;  // weak
 };
 
 // This class is used to catch the FaviconHandler's download and history
 // request, and also provide the methods to access the FaviconHandler
 // internals.
@@ skipping 19 matching lines @@
 
   // 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();
   }
 
-  virtual NavigationEntry* GetEntry() {
+  virtual NavigationEntry* GetEntry() OVERRIDE {
     return entry_.get();
   }
 
   const std::deque<FaviconURL>& urls() {
     return image_urls_;
   }
 
   void FetchFavicon(const GURL& url) {
     FaviconHandler::FetchFavicon(url);
   }
@@ skipping 710 matching lines @@
 
   // Verify correct icon size chosen.
   EXPECT_EQ(icon_url_preferred1, handler.GetEntry()->GetFavicon().url);
   EXPECT_TRUE(handler.GetEntry()->GetFavicon().valid);
   EXPECT_FALSE(handler.GetEntry()->GetFavicon().image.IsEmpty());
   EXPECT_EQ(gfx::kFaviconSize,
             handler.GetEntry()->GetFavicon().image.ToSkBitmap()->width());
 }
 
 }  // namespace.