Standardize usage of virtual/override/final in chrome/browser/

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 "chrome/browser/favicon/favicon_handler.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/favicon/chrome_favicon_client.h"
 #include "chrome/browser/favicon/chrome_favicon_client_factory.h"
 #include "chrome/browser/favicon/favicon_service.h"
@@ skipping 159 matching lines @@
   favicon_base::FaviconResultsCallback callback_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(HistoryRequestHandler);
 };
 
 }  // namespace
 
 class TestFaviconClient : public FaviconClient {
  public:
-  virtual ~TestFaviconClient() {};
+  ~TestFaviconClient() override{};
 
-  virtual FaviconService* GetFaviconService() override {
+  FaviconService* GetFaviconService() override {
     // Just give none NULL value, so overridden methods can be hit.
     return (FaviconService*)(1);
   }
 
-  virtual bool IsBookmarked(const GURL& url) override { return false; }
+  bool IsBookmarked(const GURL& url) override { return false; }
 };
 
 class TestFaviconDriver : public FaviconDriver {
  public:
   TestFaviconDriver() : favicon_validity_(false) {}
 
   virtual ~TestFaviconDriver() {
   }
 
-  virtual bool IsOffTheRecord() override { return false; }
+  bool IsOffTheRecord() override { return false; }
 
-  virtual const gfx::Image GetActiveFaviconImage() override { return image_; }
+  const gfx::Image GetActiveFaviconImage() override { return image_; }
 
-  virtual const GURL GetActiveFaviconURL() override { return favicon_url_; }
+  const GURL GetActiveFaviconURL() override { return favicon_url_; }
 
-  virtual bool GetActiveFaviconValidity() override { return favicon_validity_; }
+  bool GetActiveFaviconValidity() override { return favicon_validity_; }
 
-  virtual const GURL GetActiveURL() override { return url_; }
+  const GURL GetActiveURL() override { return url_; }
 
-  virtual void SetActiveFaviconImage(gfx::Image image) override {
-    image_ = image;
-  }
+  void SetActiveFaviconImage(gfx::Image image) override { image_ = image; }
 
-  virtual void SetActiveFaviconURL(GURL favicon_url) override {
+  void SetActiveFaviconURL(GURL favicon_url) override {
     favicon_url_ = favicon_url;
   }
 
-  virtual void SetActiveFaviconValidity(bool favicon_validity) override {
+  void SetActiveFaviconValidity(bool favicon_validity) override {
     favicon_validity_ = favicon_validity;
   }
 
-  virtual int StartDownload(const GURL& url,
-                            int max_bitmap_size) override {
+  int StartDownload(const GURL& url, int max_bitmap_size) override {
     ADD_FAILURE() << "TestFaviconDriver::StartDownload() "
                   << "should never be called in tests.";
     return -1;
   }
 
-  virtual void NotifyFaviconUpdated(bool icon_url_changed) override {
+  void NotifyFaviconUpdated(bool icon_url_changed) override {
     ADD_FAILURE() << "TestFaviconDriver::NotifyFaviconUpdated() "
                   << "should never be called in tests.";
   }
 
   void SetActiveURL(GURL url) { url_ = url; }
 
  private:
   GURL favicon_url_;
   GURL url_;
   gfx::Image image_;
@@ skipping 15 matching lines @@
                      TestFaviconDriver* driver,
                      Type type,
                      bool download_largest_icon)
       : FaviconHandler(client, driver, type, download_largest_icon),
         download_id_(0),
         num_favicon_updates_(0) {
     driver->SetActiveURL(page_url);
     download_handler_.reset(new DownloadHandler(this));
   }
 
-  virtual ~TestFaviconHandler() {
-  }
+  ~TestFaviconHandler() override {}
 
   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);
   }
 
@@ skipping 16 matching lines @@
 
   FaviconURL* current_candidate() {
     return FaviconHandler::current_candidate();
   }
 
   const FaviconCandidate& best_favicon_candidate() {
     return best_favicon_candidate_;
   }
 
  protected:
-  virtual void UpdateFaviconMappingAndFetch(
+  void UpdateFaviconMappingAndFetch(
       const GURL& page_url,
       const GURL& icon_url,
       favicon_base::IconType icon_type,
       const favicon_base::FaviconResultsCallback& callback,
       base::CancelableTaskTracker* tracker) override {
     history_handler_.reset(new HistoryRequestHandler(page_url, icon_url,
                                                      icon_type, callback));
   }
 
-  virtual void GetFaviconFromFaviconService(
+  void GetFaviconFromFaviconService(
       const GURL& icon_url,
       favicon_base::IconType icon_type,
       const favicon_base::FaviconResultsCallback& callback,
       base::CancelableTaskTracker* tracker) override {
     history_handler_.reset(new HistoryRequestHandler(GURL(), icon_url,
                                                      icon_type, callback));
   }
 
-  virtual void GetFaviconForURLFromFaviconService(
+  void GetFaviconForURLFromFaviconService(
       const GURL& page_url,
       int icon_types,
       const favicon_base::FaviconResultsCallback& callback,
       base::CancelableTaskTracker* tracker) override {
     history_handler_.reset(new HistoryRequestHandler(page_url, GURL(),
                                                      icon_types, callback));
   }
 
-  virtual int DownloadFavicon(const GURL& image_url,
-                              int max_bitmap_size) override {
+  int DownloadFavicon(const GURL& image_url, int max_bitmap_size) override {
     download_id_++;
     std::vector<int> sizes;
     sizes.push_back(0);
     download_handler_->AddDownload(
         download_id_, image_url, sizes, max_bitmap_size);
     return download_id_;
   }
 
-  virtual void SetHistoryFavicons(const GURL& page_url,
-                                  const GURL& icon_url,
-                                  favicon_base::IconType icon_type,
-                                  const gfx::Image& image) override {
+  void SetHistoryFavicons(const GURL& page_url,
+                          const GURL& icon_url,
+                          favicon_base::IconType icon_type,
+                          const gfx::Image& image) override {
     scoped_refptr<base::RefCountedMemory> bytes = image.As1xPNGBytes();
     std::vector<unsigned char> bitmap_data(bytes->front(),
                                            bytes->front() + bytes->size());
     history_handler_.reset(new HistoryRequestHandler(
         page_url, icon_url, icon_type, bitmap_data, image.Size()));
   }
 
-  virtual bool ShouldSaveFavicon(const GURL& url) override {
-    return true;
-  }
+  bool ShouldSaveFavicon(const GURL& url) override { return true; }
 
-  virtual void NotifyFaviconUpdated(bool icon_url_changed) override {
+  void NotifyFaviconUpdated(bool icon_url_changed) override {
     ++num_favicon_updates_;
   }
 
   GURL page_url_;
 
  private:
 
   // The unique id of a download request. It will be returned to a
   // FaviconHandler.
   int download_id_;
@@ skipping 1185 matching lines @@
   download_id = favicon_tab_helper->StartDownload(missing_icon_url, 0);
   EXPECT_NE(0, download_id);
   // Report download success with HTTP 200 status.
   favicon_tab_helper->DidDownloadFavicon(download_id, 200, missing_icon_url,
       empty_icons, empty_icon_sizes);
   // Icon is not marked as UnableToDownload as HTTP status is not 404.
   EXPECT_FALSE(favicon_service->WasUnableToDownloadFavicon(missing_icon_url));
 }
 
 }  // namespace.