Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / extensions / favicon_downloader_unittest.cc

diff --git a/src/chrome/browser/extensions/favicon_downloader_unittest.cc b/src/chrome/browser/extensions/favicon_downloader_unittest.cc
index b75208a..42de071 100644 (file)
--- a/src/chrome/browser/extensions/favicon_downloader_unittest.cc
+++ b/src/chrome/browser/extensions/favicon_downloader_unittest.cc
@@ -20,10 +20,7 @@ std::vector<SkBitmap> CreateTestBitmaps(const std::vector<gfx::Size>& sizes) {
   std::vector<SkBitmap> bitmaps(sizes.size());
   for (size_t i = 0; i < sizes.size(); ++i) {
     SkBitmap& bitmap = bitmaps[i];
-    bitmap.setConfig(SkBitmap::kARGB_8888_Config,
-                     sizes[i].width(),
-                     sizes[i].height());
-    bitmap.allocPixels();
+    bitmap.allocN32Pixels(sizes[i].width(), sizes[i].height());
     bitmap.eraseColor(SK_ColorRED);
   }
   return bitmaps;
@@ -34,8 +31,7 @@ class FaviconDownloaderTest : public ChromeRenderViewHostTestHarness {
   FaviconDownloaderTest() {
   }
 
-  virtual ~FaviconDownloaderTest() {
-  }
+  ~FaviconDownloaderTest() override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FaviconDownloaderTest);
@@ -54,14 +50,11 @@ class TestFaviconDownloader : public FaviconDownloader {
                        base::Unretained(this))),
         id_counter_(0) {
   }
-  virtual ~TestFaviconDownloader() {}
+  ~TestFaviconDownloader() override {}
 
-  virtual int DownloadImage(const GURL& url) OVERRIDE {
-    return id_counter_++;
-  }
+  int DownloadImage(const GURL& url) override { return id_counter_++; }
 
-  virtual std::vector<content::FaviconURL> GetFaviconURLsFromWebContents()
-      OVERRIDE {
+  std::vector<content::FaviconURL> GetFaviconURLsFromWebContents() override {
     return initial_favicon_urls_;
   }
 
@@ -87,7 +80,7 @@ class TestFaviconDownloader : public FaviconDownloader {
   }
 
   void UpdateFaviconURLs(const std::vector<content::FaviconURL>& candidates) {
-    FaviconDownloader::DidUpdateFaviconURL(0, candidates);
+    FaviconDownloader::DidUpdateFaviconURL(candidates);
   }
 
   void set_initial_favicon_urls(const std::vector<content::FaviconURL>& urls) {