Refactor favicon to use C++11 loop and fix style violation

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 63 matching lines @@
 
 // This class is used to save the download request for verifying with test case.
 // It also will be used to invoke the onDidDownload callback.
 class DownloadHandler {
  public:
   explicit DownloadHandler(TestFaviconHandler* favicon_helper)
       : favicon_helper_(favicon_helper),
         failed_(false) {
   }
 
-  virtual ~DownloadHandler() {
-  }
+  ~DownloadHandler() {}
 
   void Reset() {
-    download_.reset(NULL);
+    download_.reset();
     failed_ = false;
   }
 
   void AddDownload(
       int download_id,
       const GURL& image_url,
       const std::vector<int>& image_sizes,
       int max_image_size) {
     download_.reset(new Download(
         download_id, image_url, image_sizes, max_image_size, false));
   }
 
   void InvokeCallback();
 
   void set_failed(bool failed) { failed_ = failed; }
 
-  bool HasDownload() const { return download_.get() != NULL; }
+  bool HasDownload() const { return download_.get(); }
   const GURL& GetImageUrl() const { return download_->image_url; }
   void SetImageSizes(const std::vector<int>& sizes) {
     download_->image_sizes = sizes; }
 
  private:
   struct Download {
     Download(int id,
              GURL url,
              const std::vector<int>& sizes,
              int max_size,
@@ skipping 35 matching lines @@
                         int icon_type,
                         const std::vector<unsigned char>& bitmap_data,
                         const gfx::Size& size)
       : page_url_(page_url),
         icon_url_(icon_url),
         icon_type_(icon_type),
         bitmap_data_(bitmap_data),
         size_(size) {
   }
 
-  virtual ~HistoryRequestHandler() {}
+  ~HistoryRequestHandler() {}
   void InvokeCallback();
 
   const GURL page_url_;
   const GURL icon_url_;
   const int icon_type_;
   const std::vector<unsigned char> bitmap_data_;
   const gfx::Size size_;
   std::vector<favicon_base::FaviconRawBitmapResult> history_results_;
   favicon_base::FaviconResultsCallback callback_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(HistoryRequestHandler);
 };
 
 }  // namespace
 
 class TestFaviconClient : public FaviconClient {
  public:
-  ~TestFaviconClient() override{};
+  ~TestFaviconClient() override {}
 
   bool IsBookmarked(const GURL& url) override { return false; }
 };
 
 class TestFaviconDriver : public FaviconDriver {
  public:
   TestFaviconDriver()
       : favicon_validity_(false),
         num_active_favicon_(0),
         num_favicon_available_(0),
         update_active_favicon_(false) {}
 
-  virtual ~TestFaviconDriver() {
-  }
+  ~TestFaviconDriver() override {}
 
   bool IsOffTheRecord() override { return false; }
 
   const gfx::Image GetActiveFaviconImage() override { return image_; }
 
   const GURL GetActiveFaviconURL() override { return favicon_url_; }
 
   bool GetActiveFaviconValidity() override { return favicon_validity_; }
 
   const GURL GetActiveURL() override { return url_; }
@@ skipping 266 matching lines @@
     scale_factors.push_back(ui::SCALE_FACTOR_100P);
     scoped_set_supported_scale_factors_.reset(
         new ui::test::ScopedSetSupportedScaleFactors(scale_factors));
 
     ChromeRenderViewHostTestHarness::SetUp();
   }
 
   void TearDown() override {
     Profile* profile = Profile::FromBrowserContext(
         web_contents()->GetBrowserContext());
-    FaviconServiceFactory::GetInstance()->SetTestingFactory(
-      profile, NULL);
+    FaviconServiceFactory::GetInstance()->SetTestingFactory(profile, nullptr);
     ChromeRenderViewHostTestHarness::TearDown();
   }
 
  private:
   typedef scoped_ptr<ui::test::ScopedSetSupportedScaleFactors>
       ScopedSetSupportedScaleFactors;
   ScopedSetSupportedScaleFactors scoped_set_supported_scale_factors_;
   DISALLOW_COPY_AND_ASSIGN(FaviconHandlerTest);
 };
 
@@ skipping 79 matching lines @@
   ASSERT_EQ(favicon_base::FAVICON, helper.current_candidate()->icon_type);
 
   // Favicon should request to download icon now.
   DownloadHandler* download_handler = helper.download_handler();
   EXPECT_TRUE(helper.download_handler()->HasDownload());
 
   // Verify the download request.
   EXPECT_EQ(icon_url, download_handler->GetImageUrl());
 
   // Reset the history_handler to verify whether favicon is set.
-  helper.set_history_handler(NULL);
+  helper.set_history_handler(nullptr);
 
   // Smulates download done.
   download_handler->InvokeCallback();
 
   // New icon should be saved to history backend and navigation entry.
   history_handler = helper.history_handler();
   ASSERT_TRUE(history_handler);
   EXPECT_EQ(icon_url, history_handler->icon_url_);
   EXPECT_EQ(favicon_base::FAVICON, history_handler->icon_type_);
   EXPECT_LT(0U, history_handler->bitmap_data_.size());
@@ skipping 28 matching lines @@
   SetFaviconRawBitmapResult(icon_url, &history_handler->history_results_);
 
   // Send history response.
   history_handler->InvokeCallback();
   // Verify FaviconHandler status.
   EXPECT_TRUE(driver.GetActiveFaviconValidity());
   EXPECT_EQ(icon_url, driver.GetActiveFaviconURL());
 
   // Reset the history_handler to verify whether new icon is requested from
   // history.
-  helper.set_history_handler(NULL);
+  helper.set_history_handler(nullptr);
 
   // Simulates update with the different favicon url.
   std::vector<FaviconURL> urls;
   urls.push_back(FaviconURL(
       new_icon_url, favicon_base::FAVICON, std::vector<gfx::Size>()));
   helper.OnUpdateFaviconURL(urls);
 
   // Verify FaviconHandler status.
   EXPECT_EQ(1U, helper.urls().size());
   ASSERT_TRUE(helper.current_candidate());
@@ skipping 12 matching lines @@
   history_handler->InvokeCallback();
 
   // Favicon should request to download icon now.
   DownloadHandler* download_handler = helper.download_handler();
   EXPECT_TRUE(helper.download_handler()->HasDownload());
 
   // Verify the download request.
   EXPECT_EQ(new_icon_url, download_handler->GetImageUrl());
 
   // Reset the history_handler to verify whether favicon is set.
-  helper.set_history_handler(NULL);
+  helper.set_history_handler(nullptr);
 
   // Smulates download done.
   download_handler->InvokeCallback();
 
   // New icon should be saved to history backend and navigation entry.
   history_handler = helper.history_handler();
   ASSERT_TRUE(history_handler);
   EXPECT_EQ(new_icon_url, history_handler->icon_url_);
   EXPECT_EQ(favicon_base::FAVICON, history_handler->icon_type_);
   EXPECT_LT(0U, history_handler->bitmap_data_.size());
@@ skipping 35 matching lines @@
   history_handler->history_results_.push_back(bitmap_result);
 
   // Send history response.
   history_handler->InvokeCallback();
   // The NavigationEntry should not be set yet as the history data is invalid.
   EXPECT_FALSE(driver.GetActiveFaviconValidity());
   EXPECT_EQ(GURL(), driver.GetActiveFaviconURL());
 
   // Reset the history_handler to verify whether new icon is requested from
   // history.
-  helper.set_history_handler(NULL);
+  helper.set_history_handler(nullptr);
 
   // Simulates update with matching favicon URL.
   std::vector<FaviconURL> urls;
   urls.push_back(
       FaviconURL(icon_url, favicon_base::FAVICON, std::vector<gfx::Size>()));
   helper.OnUpdateFaviconURL(urls);
 
   // A download for the favicon should be requested, and we should not do
   // another history request.
   DownloadHandler* download_handler = helper.download_handler();
   EXPECT_TRUE(helper.download_handler()->HasDownload());
-  EXPECT_EQ(NULL, helper.history_handler());
+  EXPECT_EQ(nullptr, helper.history_handler());
 
   // Verify the download request.
   EXPECT_EQ(icon_url, download_handler->GetImageUrl());
 
   // Simulates download done.
   download_handler->InvokeCallback();
 
   // New icon should be saved to history backend and navigation entry.
   history_handler = helper.history_handler();
   ASSERT_TRUE(history_handler);
@@ skipping 30 matching lines @@
   SetFaviconRawBitmapResult(icon_url, &history_handler->history_results_);
 
   // Send history response.
   history_handler->InvokeCallback();
   // Verify FaviconHandler status.
   EXPECT_TRUE(driver.GetActiveFaviconValidity());
   EXPECT_EQ(icon_url, driver.GetActiveFaviconURL());
 
   // Reset the history_handler to verify whether new icon is requested from
   // history.
-  helper.set_history_handler(NULL);
+  helper.set_history_handler(nullptr);
 
   // Simulates update with the different favicon url.
   std::vector<FaviconURL> urls;
   urls.push_back(FaviconURL(
       new_icon_url, favicon_base::FAVICON, std::vector<gfx::Size>()));
   helper.OnUpdateFaviconURL(urls);
 
   // Verify FaviconHandler status.
   EXPECT_EQ(1U, helper.urls().size());
   ASSERT_TRUE(helper.current_candidate());
@@ skipping 42 matching lines @@
   // Icon not found.
   history_handler->history_results_.clear();
   // Send history response.
   history_handler->InvokeCallback();
   // Verify FaviconHandler status.
   EXPECT_FALSE(driver.GetActiveFaviconValidity());
   EXPECT_EQ(GURL(), driver.GetActiveFaviconURL());
 
   // Reset the history_handler to verify whether new icon is requested from
   // history.
-  helper.set_history_handler(NULL);
+  helper.set_history_handler(nullptr);
 
   // Simulates update with the different favicon url.
   std::vector<FaviconURL> urls;
   urls.push_back(FaviconURL(icon_url,
                             favicon_base::TOUCH_PRECOMPOSED_ICON,
                             std::vector<gfx::Size>()));
   urls.push_back(FaviconURL(
       new_icon_url, favicon_base::TOUCH_ICON, std::vector<gfx::Size>()));
   urls.push_back(FaviconURL(
       new_icon_url, favicon_base::FAVICON, std::vector<gfx::Size>()));
@@ skipping 19 matching lines @@
 
   // Should request download favicon.
   DownloadHandler* download_handler = helper.download_handler();
   EXPECT_TRUE(helper.download_handler()->HasDownload());
 
   // Verify the download request.
   EXPECT_EQ(icon_url, download_handler->GetImageUrl());
 
   // Reset the history_handler to verify whether favicon is request from
   // history.
-  helper.set_history_handler(NULL);
+  helper.set_history_handler(nullptr);
   // Smulates download failed.
   download_handler->set_failed(true);
   download_handler->InvokeCallback();
 
   // Left 1 url.
   EXPECT_EQ(1U, helper.urls().size());
   ASSERT_TRUE(helper.current_candidate());
   EXPECT_EQ(new_icon_url, helper.current_candidate()->icon_url);
   EXPECT_EQ(favicon_base::TOUCH_ICON, helper.current_candidate()->icon_type);
 
@@ skipping 11 matching lines @@
   SetFaviconRawBitmapResult(new_icon_url,
                             favicon_base::TOUCH_ICON,
                             true /* expired */,
                             &history_handler->history_results_);
   history_handler->InvokeCallback();
 
   // Verify the download request.
   EXPECT_TRUE(helper.download_handler()->HasDownload());
   EXPECT_EQ(new_icon_url, download_handler->GetImageUrl());
 
-  helper.set_history_handler(NULL);
+  helper.set_history_handler(nullptr);
 
   // Simulates icon being downloaded.
   download_handler->InvokeCallback();
 
   // New icon should be saved to history backend.
   history_handler = helper.history_handler();
   ASSERT_TRUE(history_handler);
   EXPECT_EQ(new_icon_url, history_handler->icon_url_);
   EXPECT_EQ(favicon_base::TOUCH_ICON, history_handler->icon_type_);
   EXPECT_LT(0U, history_handler->bitmap_data_.size());
@@ skipping 22 matching lines @@
   // Icon not found.
   history_handler->history_results_.clear();
   // Send history response.
   history_handler->InvokeCallback();
   // Verify FaviconHandler status.
   EXPECT_FALSE(driver.GetActiveFaviconValidity());
   EXPECT_EQ(GURL(), driver.GetActiveFaviconURL());
 
   // Reset the history_handler to verify whether new icon is requested from
   // history.
-  helper.set_history_handler(NULL);
+  helper.set_history_handler(nullptr);
 
   // Simulates update with the different favicon url.
   std::vector<FaviconURL> urls;
   urls.push_back(FaviconURL(icon_url,
                             favicon_base::TOUCH_PRECOMPOSED_ICON,
                             std::vector<gfx::Size>()));
   urls.push_back(FaviconURL(
       new_icon_url, favicon_base::TOUCH_ICON, std::vector<gfx::Size>()));
   urls.push_back(FaviconURL(
       new_icon_url, favicon_base::FAVICON, std::vector<gfx::Size>()));
@@ skipping 19 matching lines @@
 
   // Should request download favicon.
   DownloadHandler* download_handler = helper.download_handler();
   EXPECT_TRUE(helper.download_handler()->HasDownload());
 
   // Verify the download request.
   EXPECT_EQ(icon_url, download_handler->GetImageUrl());
 
   // Reset the history_handler to verify whether favicon is request from
   // history.
-  helper.set_history_handler(NULL);
+  helper.set_history_handler(nullptr);
   const GURL latest_icon_url("http://www.google.com/latest_favicon");
   std::vector<FaviconURL> latest_urls;
   latest_urls.push_back(FaviconURL(
       latest_icon_url, favicon_base::TOUCH_ICON, std::vector<gfx::Size>()));
   helper.OnUpdateFaviconURL(latest_urls);
 
   EXPECT_EQ(1U, helper.urls().size());
   EXPECT_EQ(latest_icon_url, helper.current_candidate()->icon_url);
   EXPECT_EQ(favicon_base::TOUCH_ICON, helper.current_candidate()->icon_type);
 
   // Whether new icon is requested from history
   history_handler = helper.history_handler();
   ASSERT_TRUE(history_handler);
   EXPECT_EQ(latest_icon_url, history_handler->icon_url_);
   EXPECT_EQ(favicon_base::TOUCH_ICON, history_handler->icon_type_);
   EXPECT_EQ(page_url, history_handler->page_url_);
 
   // Reset the history_handler to verify whether favicon is request from
   // history.
   // Save the callback for late use.
   favicon_base::FaviconResultsCallback callback = history_handler->callback_;
-  helper.set_history_handler(NULL);
+  helper.set_history_handler(nullptr);
 
   // Simulates download succeed.
   download_handler->InvokeCallback();
   // The downloaded icon should be thrown away as there is favicon update.
   EXPECT_FALSE(helper.history_handler());
 
   download_handler->Reset();
 
   // Simulates getting the icon from history.
   scoped_ptr<HistoryRequestHandler> handler;
@@ skipping 613 matching lines @@
   EXPECT_EQ(new_favicon_url, driver1.available_icon_url());
   EXPECT_FALSE(driver1.update_active_favicon());
   EXPECT_EQ(3u, driver1.num_favicon_available());
 }
 
 INSTANTIATE_TEST_CASE_P(FaviconHandlerTestActiveFaviconValidityTrueOrFalse,
                         FaviconHandlerActiveFaviconValidityParamTest,
                         ::testing::Bool());
 
 }  // namespace.