Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / common / favicon / favicon_url_parser_unittest.cc

diff --git a/src/chrome/common/favicon/favicon_url_parser_unittest.cc b/src/chrome/common/favicon/favicon_url_parser_unittest.cc
index ccbdc80..6077b7e 100644 (file)
--- a/src/chrome/common/favicon/favicon_url_parser_unittest.cc
+++ b/src/chrome/common/favicon/favicon_url_parser_unittest.cc
@@ -5,7 +5,7 @@
 #include "chrome/common/favicon/favicon_url_parser.h"
 
 #include "base/memory/scoped_ptr.h"
-#include "chrome/common/favicon/favicon_types.h"
+#include "components/favicon_base/favicon_types.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/layout.h"
 
@@ -21,8 +21,7 @@ class FaviconUrlParserTest : public testing::Test {
         new ui::test::ScopedSetSupportedScaleFactors(supported_scale_factors));
   }
 
-  virtual ~FaviconUrlParserTest() {
-  }
+  ~FaviconUrlParserTest() override {}
 
  private:
   typedef scoped_ptr<ui::test::ScopedSetSupportedScaleFactors>
@@ -35,7 +34,7 @@ class FaviconUrlParserTest : public testing::Test {
 // Test parsing path with no extra parameters.
 TEST_F(FaviconUrlParserTest, ParsingNoExtraParams) {
   const std::string url("https://www.google.ca/imghp?hl=en&tab=wi");
-  int icon_types = chrome::TOUCH_PRECOMPOSED_ICON;
+  int icon_types = favicon_base::TOUCH_PRECOMPOSED_ICON;
   chrome::ParsedFaviconPath parsed;
 
   const std::string path1 = url;
@@ -43,13 +42,13 @@ TEST_F(FaviconUrlParserTest, ParsingNoExtraParams) {
   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);
+  EXPECT_EQ(1.0f, parsed.device_scale_factor);
 }
 
 // Test parsing path with a 'size' parameter.
 TEST_F(FaviconUrlParserTest, ParsingSizeParam) {
   const std::string url("https://www.google.ca/imghp?hl=en&tab=wi");
-  int icon_types = chrome::TOUCH_PRECOMPOSED_ICON;
+  int icon_types = favicon_base::TOUCH_PRECOMPOSED_ICON;
   chrome::ParsedFaviconPath parsed;
 
   // Test that we can still parse the legacy 'size' parameter format.
@@ -58,7 +57,7 @@ TEST_F(FaviconUrlParserTest, ParsingSizeParam) {
   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);
+  EXPECT_EQ(1.0f, parsed.device_scale_factor);
 
   // Test parsing current 'size' parameter format.
   const std::string path3 = "size/32@1.4x/" + url;
@@ -66,7 +65,7 @@ TEST_F(FaviconUrlParserTest, ParsingSizeParam) {
   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);
+  EXPECT_EQ(1.4f, parsed.device_scale_factor);
 
   // Test that we pick the ui::ScaleFactor which is closest to the passed in
   // scale factor.
@@ -75,7 +74,7 @@ TEST_F(FaviconUrlParserTest, ParsingSizeParam) {
   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);
+  EXPECT_EQ(1.41f, parsed.device_scale_factor);
 
   // Invalid cases.
   const std::string path5 = "size/" + url;
@@ -91,13 +90,13 @@ TEST_F(FaviconUrlParserTest, ParsingSizeParam) {
   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);
+  EXPECT_EQ(1.0f, parsed.device_scale_factor);
 }
 
 // Test parsing path with the 'largest' parameter.
 TEST_F(FaviconUrlParserTest, ParsingLargestParam) {
   const std::string url("https://www.google.ca/imghp?hl=en&tab=wi");
-  int icon_types = chrome::TOUCH_PRECOMPOSED_ICON;
+  int icon_types = favicon_base::TOUCH_PRECOMPOSED_ICON;
   chrome::ParsedFaviconPath parsed;
 
   const std::string path9 = "largest/" + url;
@@ -111,7 +110,7 @@ TEST_F(FaviconUrlParserTest, ParsingLargestParam) {
 // Test parsing path with 'iconurl' parameter.
 TEST_F(FaviconUrlParserTest, ParsingIconUrlParam) {
   const std::string url("https://www.google.ca/imghp?hl=en&tab=wi");
-  int icon_types = chrome::TOUCH_PRECOMPOSED_ICON;
+  int icon_types = favicon_base::TOUCH_PRECOMPOSED_ICON;
   chrome::ParsedFaviconPath parsed;
 
   const std::string path10 = "iconurl/http://www.google.com/favicon.ico";
@@ -119,13 +118,13 @@ TEST_F(FaviconUrlParserTest, ParsingIconUrlParam) {
   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);
+  EXPECT_EQ(1.0f, parsed.device_scale_factor);
 }
 
 // Test parsing path with 'origin' parameter.
 TEST_F(FaviconUrlParserTest, ParsingOriginParam) {
   const std::string url("https://www.google.ca/imghp?hl=en&tab=wi");
-  int icon_types = chrome::TOUCH_PRECOMPOSED_ICON;
+  int icon_types = favicon_base::TOUCH_PRECOMPOSED_ICON;
   chrome::ParsedFaviconPath parsed;
 
   const std::string path11 = "origin/" + url;
@@ -133,21 +132,21 @@ TEST_F(FaviconUrlParserTest, ParsingOriginParam) {
   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);
+  EXPECT_EQ(1.0f, parsed.device_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);
+  EXPECT_EQ(1.0f, parsed.device_scale_factor);
 }
 
 // Test parsing paths with both a 'size' parameter and a 'url modifier'
 // parameter.
 TEST_F(FaviconUrlParserTest, ParsingSizeParamAndUrlModifier) {
   const std::string url("https://www.google.ca/imghp?hl=en&tab=wi");
-  int icon_types = chrome::TOUCH_PRECOMPOSED_ICON;
+  int icon_types = favicon_base::TOUCH_PRECOMPOSED_ICON;
   chrome::ParsedFaviconPath parsed;
 
   const std::string path13 = "size/32@1.4x/origin/" + url;
@@ -155,7 +154,7 @@ TEST_F(FaviconUrlParserTest, ParsingSizeParamAndUrlModifier) {
   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);
+  EXPECT_EQ(1.4f, parsed.device_scale_factor);
 
   const std::string path14 =
       "largest/iconurl/http://www.google.com/favicon.ico";