Unify desktop Linux and Chrome OS font rendering params.

ui/gfx/font_render_params_linux_unittest.cc

 // Copyright 2014 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 "ui/gfx/font_render_params.h"
 
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "base/macros.h"
@@ skipping 44 matching lines @@
       kFontconfigMatchHeader +
       CreateFontconfigEditStanza("antialias", "bool", "true") +
       CreateFontconfigEditStanza("autohint", "bool", "false") +
       CreateFontconfigEditStanza("hinting", "bool", "true") +
       CreateFontconfigEditStanza("hintstyle", "const", "hintfull") +
       CreateFontconfigEditStanza("rgba", "const", "rgb") +
       kFontconfigMatchFooter +
       kFontconfigFileFooter));
 
   FontRenderParams params = GetDefaultFontRenderParams();
-#if defined(OS_CHROMEOS)
-  // Chrome OS uses its own defaults for everything except subpixel rendering,
-  // which comes from Fontconfig.
-  EXPECT_TRUE(params.antialiasing);
-  EXPECT_TRUE(params.autohinter);
-  EXPECT_TRUE(params.use_bitmaps);
-  EXPECT_EQ(FontRenderParams::HINTING_SLIGHT, params.hinting);
-#else
-  // Desktop Linux gets all settings from fontconfig.
   EXPECT_TRUE(params.antialiasing);
   EXPECT_FALSE(params.autohinter);
   EXPECT_TRUE(params.use_bitmaps);
   EXPECT_EQ(FontRenderParams::HINTING_FULL, params.hinting);
-#endif
   EXPECT_FALSE(params.subpixel_positioning);
   EXPECT_EQ(FontRenderParams::SUBPIXEL_RENDERING_RGB,
             params.subpixel_rendering);
 }
 
-// Chrome OS ignores most Fontconfig settings.
-#if !defined(OS_CHROMEOS)
 TEST_F(FontRenderParamsTest, Size) {
   // Fontconfig needs to know about at least one font to return a match.
   ASSERT_TRUE(LoadSystemFont("arial.ttf"));
   ASSERT_TRUE(LoadConfigDataIntoFontconfig(temp_dir_.path(),
       std::string(kFontconfigFileHeader) +
       kFontconfigMatchHeader +
       CreateFontconfigEditStanza("antialias", "bool", "true") +
       CreateFontconfigEditStanza("hinting", "bool", "true") +
       CreateFontconfigEditStanza("hintstyle", "const", "hintfull") +
       CreateFontconfigEditStanza("rgba", "const", "none") +
@@ skipping 26 matching lines @@
   EXPECT_EQ(FontRenderParams::SUBPIXEL_RENDERING_NONE,
             params.subpixel_rendering);
 
   int point_size = 20;
   params = GetCustomFontRenderParams(false, NULL, NULL, &point_size, NULL);
   EXPECT_TRUE(params.antialiasing);
   EXPECT_EQ(FontRenderParams::HINTING_SLIGHT, params.hinting);
   EXPECT_EQ(FontRenderParams::SUBPIXEL_RENDERING_RGB,
             params.subpixel_rendering);
 }
-#endif  // !defined(OS_CHROMEOS)
 
 }  // namespace gfx