Put color util and color analysis tests into color_utils namespace.

ui/gfx/color_utils_unittest.cc

Index: ui/gfx/color_utils_unittest.cc
diff --git a/ui/gfx/color_utils_unittest.cc b/ui/gfx/color_utils_unittest.cc
index 59eaeba1e3e8c779b3a475cc768003e54113a1f7..60106f4d8a4247cb948775049456882d3735aad9 100644
--- a/ui/gfx/color_utils_unittest.cc
+++ b/ui/gfx/color_utils_unittest.cc
@@ -9,17 +9,19 @@
 #include "third_party/skia/include/core/SkColorPriv.h"
 #include "ui/gfx/color_utils.h"
 
+namespace color_utils {
+
 TEST(ColorUtils, SkColorToHSLRed) {
-  color_utils::HSL hsl = { 0, 0, 0 };
-  color_utils::SkColorToHSL(SK_ColorRED, &hsl);
+  HSL hsl = {0, 0, 0};
+  SkColorToHSL(SK_ColorRED, &hsl);
   EXPECT_DOUBLE_EQ(hsl.h, 0);
   EXPECT_DOUBLE_EQ(hsl.s, 1);
   EXPECT_DOUBLE_EQ(hsl.l, 0.5);
 }
 
 TEST(ColorUtils, SkColorToHSLGrey) {
-  color_utils::HSL hsl = { 0, 0, 0 };
-  color_utils::SkColorToHSL(SkColorSetARGB(255, 128, 128, 128), &hsl);
+  HSL hsl = {0, 0, 0};
+  SkColorToHSL(SkColorSetARGB(255, 128, 128, 128), &hsl);
   EXPECT_DOUBLE_EQ(hsl.h, 0);
   EXPECT_DOUBLE_EQ(hsl.s, 0);
   EXPECT_EQ(static_cast<int>(hsl.l * 100),
@@ -28,8 +30,8 @@ TEST(ColorUtils, SkColorToHSLGrey) {
 
 TEST(ColorUtils, HSLToSkColorWithAlpha) {
   SkColor red = SkColorSetARGB(128, 255, 0, 0);
-  color_utils::HSL hsl = { 0, 1, 0.5 };
-  SkColor result = color_utils::HSLToSkColor(hsl, 128);
+  HSL hsl = {0, 1, 0.5};
+  SkColor result = HSLToSkColor(hsl, 128);
   EXPECT_EQ(SkColorGetA(red), SkColorGetA(result));
   EXPECT_EQ(SkColorGetR(red), SkColorGetR(result));
   EXPECT_EQ(SkColorGetG(red), SkColorGetG(result));
@@ -43,9 +45,9 @@ TEST(ColorUtils, RGBtoHSLRoundTrip) {
     for (int g = 0; g < 10; ++g) {
       for (int b = 0; b < 10; ++b) {
         SkColor rgb = SkColorSetARGB(255, r, g, b);
-        color_utils::HSL hsl = { 0, 0, 0 };
-        color_utils::SkColorToHSL(rgb, &hsl);
-        SkColor out = color_utils::HSLToSkColor(hsl, 255);
+        HSL hsl = {0, 0, 0};
+        SkColorToHSL(rgb, &hsl);
+        SkColor out = HSLToSkColor(hsl, 255);
         EXPECT_EQ(SkColorGetR(out), SkColorGetR(rgb));
         EXPECT_EQ(SkColorGetG(out), SkColorGetG(rgb));
         EXPECT_EQ(SkColorGetB(out), SkColorGetB(rgb));
@@ -56,9 +58,9 @@ TEST(ColorUtils, RGBtoHSLRoundTrip) {
     for (int g = 240; g < 256; ++g) {
       for (int b = 240; b < 256; ++b) {
         SkColor rgb = SkColorSetARGB(255, r, g, b);
-        color_utils::HSL hsl = { 0, 0, 0 };
-        color_utils::SkColorToHSL(rgb, &hsl);
-        SkColor out = color_utils::HSLToSkColor(hsl, 255);
+        HSL hsl = {0, 0, 0};
+        SkColorToHSL(rgb, &hsl);
+        SkColor out = HSLToSkColor(hsl, 255);
         EXPECT_EQ(SkColorGetR(out), SkColorGetR(rgb));
         EXPECT_EQ(SkColorGetG(out), SkColorGetG(rgb));
         EXPECT_EQ(SkColorGetB(out), SkColorGetB(rgb));
@@ -71,8 +73,8 @@ TEST(ColorUtils, ColorToHSLRegisterSpill) {
   // In a opt build on Linux, this was causing a register spill on my laptop
   // (Pentium M) when converting from SkColor to HSL.
   SkColor input = SkColorSetARGB(255, 206, 154, 89);
-  color_utils::HSL hsl = { -1, -1, -1 };
-  SkColor result = color_utils::HSLShift(input, hsl);
+  HSL hsl = {-1, -1, -1};
+  SkColor result = HSLShift(input, hsl);
   // |result| should be the same as |input| since we passed in a value meaning
   // no color shift.
   EXPECT_EQ(SkColorGetA(input), SkColorGetA(result));
@@ -85,16 +87,16 @@ TEST(ColorUtils, AlphaBlend) {
   SkColor fore = SkColorSetARGB(255, 200, 200, 200);
   SkColor back = SkColorSetARGB(255, 100, 100, 100);
 
-  EXPECT_TRUE(color_utils::AlphaBlend(fore, back, 255) ==
-              fore);
-  EXPECT_TRUE(color_utils::AlphaBlend(fore, back, 0) ==
-              back);
+  EXPECT_TRUE(AlphaBlend(fore, back, 255) == fore);
+  EXPECT_TRUE(AlphaBlend(fore, back, 0) == back);
 
   // One is fully transparent, result is partially transparent.
   back = SkColorSetA(back, 0);
-  EXPECT_EQ(136U, SkColorGetA(color_utils::AlphaBlend(fore, back, 136)));
+  EXPECT_EQ(136U, SkColorGetA(AlphaBlend(fore, back, 136)));
 
   // Both are fully transparent, result is fully transparent.
   fore = SkColorSetA(fore, 0);
-  EXPECT_EQ(0U, SkColorGetA(color_utils::AlphaBlend(fore, back, 255)));
+  EXPECT_EQ(0U, SkColorGetA(AlphaBlend(fore, back, 255)));
 }
+
+}  // namespace color_utils