Use high resolution icons where possible for streamlined hosted app icons.

chrome/browser/favicon/favicon_downloader_unittest.cc

Index: chrome/browser/favicon/favicon_downloader_unittest.cc
diff --git a/chrome/browser/favicon/favicon_downloader_unittest.cc b/chrome/browser/favicon/favicon_downloader_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..62ce88d92cc18d917ea3009422cc7cab7930f0cd
--- /dev/null
+++ b/chrome/browser/favicon/favicon_downloader_unittest.cc
@@ -0,0 +1,195 @@
+// Copyright 2013 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_downloader.h"
+
+#include "base/files/scoped_temp_dir.h"
+#include "chrome/test/base/chrome_render_view_host_test_harness.h"
+#include "content/public/common/favicon_url.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/skia/include/core/SkBitmap.h"
+
+using content::RenderViewHostTester;
+
+namespace {
+
+// Creates valid SkBitmaps of the dimensions found in |sizes| and pushes them
+// into |bitmaps|.
+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.eraseColor(SK_ColorRED);
+  }
+  return bitmaps;
+}
+
+class FaviconDownloaderTest : public ChromeRenderViewHostTestHarness {
+ protected:
+  FaviconDownloaderTest() {
+  }
+
+  virtual ~FaviconDownloaderTest() {
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(FaviconDownloaderTest);
+};
+
+}  // namespace
+
+class TestFaviconDownloader : public FaviconDownloader {
+ public:
+  explicit TestFaviconDownloader(content::WebContents* web_contents)
+      : FaviconDownloader(
+            web_contents,
+            base::Bind(&TestFaviconDownloader::DownloadsComplete,
+                       base::Unretained(this))),
+        id_counter_(0) {
+  }
+  virtual ~TestFaviconDownloader() {}
+
+  virtual int DownloadImage(const GURL& url) OVERRIDE {
+    return id_counter_++;
+  }
+
+  virtual void PopulateFaviconURLsFromWebContents() {
+    if (!initial_favicon_urls_.empty())
+      favicon_url_candidates_ = &initial_favicon_urls_;
+  }
+
+  size_t pending_requests() const {
+    return in_progress_requests_.size();
+  }
+
+  void DownloadsComplete(bool success,
+                         const FaviconDownloader::FaviconMap& map) {
+    favicon_map_ = map;
+  }
+
+  FaviconDownloader::FaviconMap favicon_map() const {
+    return favicon_map_;
+  }
+
+  void CompleteImageDownload(
+      int id,
+      const GURL& image_url,
+      const std::vector<gfx::Size>& original_bitmap_sizes) {
+    FaviconDownloader::DidDownloadFavicon(id, 200, image_url,
+        CreateTestBitmaps(original_bitmap_sizes), original_bitmap_sizes);
+  }
+
+  void UpdateFaviconURLs(const std::vector<content::FaviconURL>& candidates) {
+    FaviconDownloader::DidUpdateFaviconURL(0, candidates);
+  }
+
+  void set_initial_favicon_urls(const std::vector<content::FaviconURL>& urls) {
+    initial_favicon_urls_ = urls;
+  }
+
+ private:
+  std::vector<content::FaviconURL> initial_favicon_urls_;
+  FaviconDownloader::FaviconMap favicon_map_;
+  int id_counter_;
+  DISALLOW_COPY_AND_ASSIGN(TestFaviconDownloader);
+};
+
+TEST_F(FaviconDownloaderTest, SimpleDownload) {
+  const GURL favicon_url("http://www.google.com/favicon.ico");
+  TestFaviconDownloader downloader(web_contents());
+
+  std::vector<content::FaviconURL> favicon_urls;
+  favicon_urls.push_back(
+      content::FaviconURL(favicon_url,
+                          content::FaviconURL::FAVICON));
+  downloader.set_initial_favicon_urls(favicon_urls);
+  EXPECT_EQ(0, downloader.pending_requests());
+
+  downloader.Start();
+  EXPECT_EQ(1, downloader.pending_requests());
+
+  std::vector<gfx::Size> sizes(1, gfx::Size(32, 32));
+  downloader.CompleteImageDownload(0, favicon_urls[0].icon_url, sizes);
+  EXPECT_EQ(0, downloader.pending_requests());
+
+  EXPECT_EQ(1, downloader.favicon_map().size());
+  EXPECT_EQ(1, downloader.favicon_map()[favicon_url].size());
+}
+
+TEST_F(FaviconDownloaderTest, DownloadWithUrlsFromWebContentsNotification) {
+  const GURL favicon_url("http://www.google.com/favicon.ico");
+  TestFaviconDownloader downloader(web_contents());
+
+  std::vector<content::FaviconURL> favicon_urls;
+  favicon_urls.push_back(
+      content::FaviconURL(favicon_url,
+                          content::FaviconURL::FAVICON));
+  EXPECT_EQ(0, downloader.pending_requests());
+
+  // Start downloader before favicon URLs are loaded.
+  downloader.Start();
+  EXPECT_EQ(0, downloader.pending_requests());
+
+  downloader.UpdateFaviconURLs(favicon_urls);
+  EXPECT_EQ(1, downloader.pending_requests());
+
+  std::vector<gfx::Size> sizes(1, gfx::Size(32, 32));
+  downloader.CompleteImageDownload(0, favicon_urls[0].icon_url, sizes);
+  EXPECT_EQ(0, downloader.pending_requests());
+
+  EXPECT_EQ(1, downloader.favicon_map().size());
+  EXPECT_EQ(1, downloader.favicon_map()[favicon_url].size());
+}
+
+TEST_F(FaviconDownloaderTest, DownloadMultipleUrls) {
+  TestFaviconDownloader downloader(web_contents());
+  const GURL empty_favicon("http://www.google.com/empty_favicon.ico");
+  const GURL favicon_url_1("http://www.google.com/favicon.ico");
+  const GURL favicon_url_2("http://www.google.com/favicon2.ico");
+
+  // This should get downloaded.
+  downloader.AddExtraFaviconUrl(favicon_url_2);
+
+  // This is duplicated in the favicon urls and should only be downloaded once.
+  downloader.AddExtraFaviconUrl(empty_favicon);
+
+  std::vector<content::FaviconURL> favicon_urls;
+  favicon_urls.push_back(
+      content::FaviconURL(favicon_url_1,
+                          content::FaviconURL::FAVICON));
+  // This is duplicated in the favicon urls and should only be downloaded once.
+  favicon_urls.push_back(
+      content::FaviconURL(empty_favicon,
+                          content::FaviconURL::FAVICON));
+  // Invalid icons shouldn't get put into the download queue.
+  favicon_urls.push_back(
+      content::FaviconURL(GURL("http://www.google.com/invalid.ico"),
+                          content::FaviconURL::INVALID_ICON));
+  downloader.set_initial_favicon_urls(favicon_urls);
+  downloader.Start();
+  EXPECT_EQ(3, downloader.pending_requests());
+
+  std::vector<gfx::Size> sizes_1(1, gfx::Size(16, 16));
+  downloader.CompleteImageDownload(0, favicon_url_1, sizes_1);
+
+  std::vector<gfx::Size> sizes_2;
+  sizes_2.push_back(gfx::Size(32, 32));
+  sizes_2.push_back(gfx::Size(64, 64));
+  downloader.CompleteImageDownload(1, favicon_url_2, sizes_2);
+
+  // Only 1 download should have been initiated for |empty_favicon| even though
+  // the URL was in both the web app info and the favicon urls.
+  downloader.CompleteImageDownload(2, empty_favicon, std::vector<gfx::Size>());
+  EXPECT_EQ(0, downloader.pending_requests());
+
+  EXPECT_EQ(3, downloader.favicon_map().size());
+  EXPECT_EQ(0, downloader.favicon_map()[empty_favicon].size());
+  EXPECT_EQ(1, downloader.favicon_map()[favicon_url_1].size());
+  EXPECT_EQ(2, downloader.favicon_map()[favicon_url_2].size());
+}
+