Supporting high dpi favicons in Instant Extended.

chrome/common/favicon/favicon_url_parser_unittest.cc

Index: chrome/common/favicon/favicon_url_parser_unittest.cc
diff --git a/chrome/common/favicon/favicon_url_parser_unittest.cc b/chrome/common/favicon/favicon_url_parser_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..ad9e072ee4d6895dab0d5104904cb41e1388c151
--- /dev/null
+++ b/chrome/common/favicon/favicon_url_parser_unittest.cc
@@ -0,0 +1,138 @@
+// Copyright (c) 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/common/favicon/favicon_url_parser.h"
+
+#include "base/memory/scoped_ptr.h"
+#include "chrome/common/favicon/favicon_types.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "ui/base/layout.h"
+
+class FaviconUrlParserTest : public testing::Test {
+ public:
+  FaviconUrlParserTest() {
+    // Set the supported scale factors because the supported scale factors
+    // affect the result of ParsePathAndScale().
+    std::vector<ui::ScaleFactor> supported_scale_factors;
+    supported_scale_factors.push_back(ui::SCALE_FACTOR_100P);
+    supported_scale_factors.push_back(ui::SCALE_FACTOR_140P);
+    scoped_set_supported_scale_factors_.reset(
+        new ui::test::ScopedSetSupportedScaleFactors(supported_scale_factors));
+  }
+
+  virtual ~FaviconUrlParserTest() {
+  }
+
+ private:
+  typedef scoped_ptr<ui::test::ScopedSetSupportedScaleFactors>
+      ScopedSetSupportedScaleFactors;
+  ScopedSetSupportedScaleFactors scoped_set_supported_scale_factors_;
+
+  DISALLOW_COPY_AND_ASSIGN(FaviconUrlParserTest);
+};
+
+// Test parsing the chrome://favicon URLs
+TEST_F(FaviconUrlParserTest, Parsing) {
+  const std::string url("https://www.google.ca/imghp?hl=en&tab=wi");
+  int icon_types = chrome::TOUCH_PRECOMPOSED_ICON;
+  chrome::ParsedFaviconPath parsed;
+
+  // 1) Test parsing path with no extra parameters.

[James Hawkins, 2013/07/07 18:14:01]

Each of these points should be a separate test.

[pedro (no code reviews), 2013/07/10 01:27:39]

Done.

+  const std::string path1 = url;
+  EXPECT_TRUE(chrome::ParseFaviconPath(path1, icon_types, &parsed));
+  EXPECT_FALSE(parsed.is_icon_url);
+  EXPECT_EQ(url, parsed.url);
+  EXPECT_EQ(16, parsed.size_in_dip);
+  EXPECT_EQ(ui::SCALE_FACTOR_100P, parsed.scale_factor);
+
+  // 2) Test parsing path with a 'size' parameter.
+  //
+  // Test that we can still parse the legacy 'size' parameter format.
+  const std::string path2 = "size/32/" + url;
+  EXPECT_TRUE(chrome::ParseFaviconPath(path2, icon_types, &parsed));
+  EXPECT_FALSE(parsed.is_icon_url);
+  EXPECT_EQ(url, parsed.url);
+  EXPECT_EQ(32, parsed.size_in_dip);
+  EXPECT_EQ(ui::SCALE_FACTOR_100P, parsed.scale_factor);
+
+  // Test parsing current 'size' parameter format.
+  const std::string path3 = "size/32@1.4x/" + url;
+  EXPECT_TRUE(chrome::ParseFaviconPath(path3, icon_types, &parsed));
+  EXPECT_FALSE(parsed.is_icon_url);
+  EXPECT_EQ(url, parsed.url);
+  EXPECT_EQ(32, parsed.size_in_dip);
+  EXPECT_EQ(ui::SCALE_FACTOR_140P, parsed.scale_factor);
+
+  // Test that we pick the ui::ScaleFactor which is closest to the passed in
+  // scale factor.
+  const std::string path4 = "size/16@1.41x/" + url;
+  EXPECT_TRUE(chrome::ParseFaviconPath(path4, icon_types, &parsed));
+  EXPECT_FALSE(parsed.is_icon_url);
+  EXPECT_EQ(url, parsed.url);
+  EXPECT_EQ(16, parsed.size_in_dip);
+  EXPECT_EQ(ui::SCALE_FACTOR_140P, parsed.scale_factor);
+
+  // Invalid cases.
+  const std::string path5 = "size/" + url;
+  EXPECT_FALSE(chrome::ParseFaviconPath(path5, icon_types, &parsed));
+  const std::string path6 = "size/@1x/" + url;
+  EXPECT_FALSE(chrome::ParseFaviconPath(path6, icon_types, &parsed));
+  const std::string path7 = "size/abc@1x/" + url;
+  EXPECT_FALSE(chrome::ParseFaviconPath(path7, icon_types, &parsed));
+
+  // Part of url looks like 'size' parameter.
+  const std::string path8 = "http://www.google.com/size/32@1.4x";
+  EXPECT_TRUE(chrome::ParseFaviconPath(path8, icon_types, &parsed));
+  EXPECT_FALSE(parsed.is_icon_url);
+  EXPECT_EQ(path8, parsed.url);
+  EXPECT_EQ(16, parsed.size_in_dip);
+  EXPECT_EQ(ui::SCALE_FACTOR_100P, parsed.scale_factor);
+
+  // 3) Test parsing path with the 'largest' parameter.
+  const std::string path9 = "largest/" + url;
+  EXPECT_TRUE(chrome::ParseFaviconPath(path9, icon_types, &parsed));
+  EXPECT_FALSE(parsed.is_icon_url);
+  EXPECT_EQ(url, parsed.url);
+  EXPECT_EQ(0, parsed.size_in_dip);
+  // The scale factor is meaningless when requesting the largest favicon.
+
+  // 4) Test parsing path with 'iconurl' parameter.
+  const std::string path10 = "iconurl/http://www.google.com/favicon.ico";
+  EXPECT_TRUE(chrome::ParseFaviconPath(path10, icon_types, &parsed));
+  EXPECT_TRUE(parsed.is_icon_url);
+  EXPECT_EQ("http://www.google.com/favicon.ico", parsed.url);
+  EXPECT_EQ(16, parsed.size_in_dip);
+  EXPECT_EQ(ui::SCALE_FACTOR_100P, parsed.scale_factor);
+
+  // 5) Test parsing path with 'origin' parameter.
+  const std::string path11 = "origin/" + url;
+  EXPECT_TRUE(chrome::ParseFaviconPath(path11, icon_types, &parsed));
+  EXPECT_FALSE(parsed.is_icon_url);
+  EXPECT_EQ("https://www.google.ca/", parsed.url);
+  EXPECT_EQ(16, parsed.size_in_dip);
+  EXPECT_EQ(ui::SCALE_FACTOR_100P, parsed.scale_factor);
+
+  const std::string path12 = "origin/google.com";
+  EXPECT_TRUE(chrome::ParseFaviconPath(path12, icon_types, &parsed));
+  EXPECT_FALSE(parsed.is_icon_url);
+  EXPECT_EQ("http://google.com/", parsed.url);
+  EXPECT_EQ(16, parsed.size_in_dip);
+  EXPECT_EQ(ui::SCALE_FACTOR_100P, parsed.scale_factor);
+
+  // 6) Test parsing paths with both a 'size' parameter and a 'url modifier'
+  // parameter.
+  const std::string path13 = "size/32@1.4x/origin/" + url;
+  EXPECT_TRUE(chrome::ParseFaviconPath(path13, icon_types, &parsed));
+  EXPECT_FALSE(parsed.is_icon_url);
+  EXPECT_EQ("https://www.google.ca/", parsed.url);
+  EXPECT_EQ(32, parsed.size_in_dip);
+  EXPECT_EQ(ui::SCALE_FACTOR_140P, parsed.scale_factor);
+
+  const std::string path14 =
+      "largest/iconurl/http://www.google.com/favicon.ico";
+  EXPECT_TRUE(chrome::ParseFaviconPath(path14, icon_types, &parsed));
+  EXPECT_TRUE(parsed.is_icon_url);
+  EXPECT_EQ("http://www.google.com/favicon.ico", parsed.url);
+  EXPECT_EQ(0, parsed.size_in_dip);
+}