Move ColorUtils to chrome/browser/util.

Bug: 995916
Change-Id: If09bacfa393160123376515e36d54c1540c5e1f4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1879467Reviewed-by: Theresa  <twellington@chromium.org>
Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
Cr-Commit-Position: refs/heads/master@{#709161}

chrome/android/chrome_java_sources.gni

@@ -1724,7 +1724,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/ui/tablet/emptybackground/EmptyBackgroundViewWrapper.java",
   "java/src/org/chromium/chrome/browser/ui/tablet/emptybackground/incognitotoggle/IncognitoToggleButton.java",
   "java/src/org/chromium/chrome/browser/ui/tablet/emptybackground/incognitotoggle/IncognitoToggleButtonTablet.java",
-  "java/src/org/chromium/chrome/browser/util/ColorUtils.java",
   "java/src/org/chromium/chrome/browser/util/FeatureUtilities.java",
   "java/src/org/chromium/chrome/browser/vr/ArDelegate.java",
   "java/src/org/chromium/chrome/browser/vr/ArDelegateProvider.java",

chrome/browser/util/android/BUILD.gn

@@ -11,6 +11,7 @@ android_library("java") {
     "java/src/org/chromium/chrome/browser/util/BitmapCache.java",
     "java/src/org/chromium/chrome/browser/util/ChromeContextUtil.java",
     "java/src/org/chromium/chrome/browser/util/ChromeFileProvider.java",
+    "java/src/org/chromium/chrome/browser/util/ColorUtils.java",
     "java/src/org/chromium/chrome/browser/util/ConversionUtils.java",
     "java/src/org/chromium/chrome/browser/util/FileSizeUtil.java",
     "java/src/org/chromium/chrome/browser/util/HashUtil.java",

chrome/android/java/src/org/chromium/chrome/browser/util/ColorUtils.java → chrome/browser/util/android/java/src/org/chromium/chrome/browser/util/ColorUtils.java

@@ -31,7 +31,8 @@ public class ColorUtils {
         return average / 255.0f;
     }
 
-    /** Calculates the contrast between the given color and white, using the algorithm provided by
+    /**
+     * Calculates the contrast between the given color and white, using the algorithm provided by
      * the WCAG v2 in http://www.w3.org/TR/WCAG20/#contrast-ratiodef.
      */
     private static float getContrastForColor(int color) {
@@ -52,13 +53,12 @@ public class ColorUtils {
      * @param overlayAlpha The alpha |overlayColor| should have on the base color.
      */
     public static int getColorWithOverlay(int baseColor, int overlayColor, float overlayAlpha) {
-        return Color.rgb(
-                (int) MathUtils.interpolate(Color.red(baseColor), Color.red(overlayColor),
-                        overlayAlpha),
-                (int) MathUtils.interpolate(Color.green(baseColor), Color.green(overlayColor),
-                        overlayAlpha),
-                (int) MathUtils.interpolate(Color.blue(baseColor), Color.blue(overlayColor),
-                        overlayAlpha));
+        return Color.rgb((int) MathUtils.interpolate(
+                                 Color.red(baseColor), Color.red(overlayColor), overlayAlpha),
+                (int) MathUtils.interpolate(
+                        Color.green(baseColor), Color.green(overlayColor), overlayAlpha),
+                (int) MathUtils.interpolate(
+                        Color.blue(baseColor), Color.blue(overlayColor), overlayAlpha));
     }
 
     /**
@@ -132,8 +132,8 @@ public class ColorUtils {
             return Color.WHITE;
         } else {
             // Light theme.
-            return ColorUtils.getColorWithOverlay(themeColor, Color.BLACK,
-                    THEMED_FOREGROUND_BLACK_FRACTION);
+            return ColorUtils.getColorWithOverlay(
+                    themeColor, Color.BLACK, THEMED_FOREGROUND_BLACK_FRACTION);
         }
     }
 }