Revert "Compute omnibox background color from toolbar color."

This reverts commit 38ee3ee4.

Reason for revert: UX would like a complete review before making this change.

Original change's description:
> Compute omnibox background color from toolbar color.
> 
> This makes the omnibox/toolbar contrast ratio 1.3 by default.
> Theme authors can manually override the default colors.
> 
> Bug: 878664
> Change-Id: I24b95e8d225fd375b573b48e403fbf147013e940
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1986244
> Commit-Queue: Peter Kasting <pkasting@chromium.org>
> Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#730295}

TBR=pkasting@chromium.org,thomasanderson@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 878664
Change-Id: I1fb8a3c7cfd1b8cd57a260cc9d7f00aa8131e024
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2070601Reviewed-by: Peter Kasting <pkasting@chromium.org>
Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#744429}

chrome/browser/themes/theme_helper.cc

@@ -237,25 +237,6 @@ SkColor ThemeHelper::GetDefaultColor(
   // For backward compat with older themes, some newer colors are generated from
   // older ones if they are missing.
   switch (id) {
-    case TP::COLOR_OMNIBOX_BACKGROUND: {
-      constexpr float kMinOmniboxToolbarContrast = 1.3f;
-      const SkColor toolbar_color =
-          GetColor(TP::COLOR_TOOLBAR, incognito, theme_supplier);
-      const SkColor endpoint_color =
-          color_utils::GetEndpointColorWithMinContrast(toolbar_color);
-      const SkColor blend_target =
-          (color_utils::GetContrastRatio(toolbar_color, endpoint_color) >=
-           kMinOmniboxToolbarContrast)
-              ? endpoint_color
-              : color_utils::GetColorWithMaxContrast(endpoint_color);
-      return color_utils::BlendForMinContrast(toolbar_color, toolbar_color,
-                                              blend_target,
-                                              kMinOmniboxToolbarContrast)
-          .color;
-    }
-    case TP::COLOR_OMNIBOX_TEXT:
-      return color_utils::GetColorWithMaxContrast(
-          GetColor(TP::COLOR_OMNIBOX_BACKGROUND, incognito, theme_supplier));
     case TP::COLOR_TOOLBAR_BUTTON_ICON:
     case TP::COLOR_TOOLBAR_BUTTON_ICON_HOVERED:
     case TP::COLOR_TOOLBAR_BUTTON_ICON_PRESSED:
@@ -541,6 +522,8 @@ base::Optional<ThemeHelper::OmniboxColor> ThemeHelper::GetOmniboxColorImpl(
     case TP::COLOR_OMNIBOX_TEXT:
     case TP::COLOR_OMNIBOX_RESULTS_TEXT_SELECTED:
       return fg;
+    case TP::COLOR_OMNIBOX_BACKGROUND:
+      return bg;
     case TP::COLOR_OMNIBOX_BACKGROUND_HOVERED:
       return bg_hovered_color();
     case TP::COLOR_OMNIBOX_RESULTS_BG:

chrome/browser/themes/theme_properties.cc

@@ -109,6 +109,10 @@ SkColor GetLightModeColor(int id) {
       return SK_ColorWHITE;
     case ThemeProperties::COLOR_FEATURE_PROMO_BUBBLE_BACKGROUND:
       return gfx::kGoogleBlue700;
+    case ThemeProperties::COLOR_OMNIBOX_TEXT:
+      return gfx::kGoogleGrey900;
+    case ThemeProperties::COLOR_OMNIBOX_BACKGROUND:
+      return gfx::kGoogleGrey100;
 
     case ThemeProperties::COLOR_FRAME_INCOGNITO:
     case ThemeProperties::COLOR_FRAME_INCOGNITO_INACTIVE:
@@ -169,6 +173,10 @@ base::Optional<SkColor> GetIncognitoColor(int id) {
       return SkColorSetRGB(0x28, 0x28, 0x28);
     case ThemeProperties::COLOR_NTP_LINK:
       return gfx::kGoogleBlue300;
+    case ThemeProperties::COLOR_OMNIBOX_TEXT:
+      return SK_ColorWHITE;
+    case ThemeProperties::COLOR_OMNIBOX_BACKGROUND:
+      return gfx::kGoogleGrey900;
     default:
       return base::nullopt;
   }

chrome/browser/ui/color/chrome_color_mixers.cc

@@ -4,40 +4,18 @@
 
 #include "chrome/browser/ui/color/chrome_color_mixers.h"
 
-#include "base/bind.h"
 #include "chrome/browser/ui/color/chrome_color_id.h"
 #include "ui/color/color_id.h"
 #include "ui/color/color_mixer.h"
 #include "ui/color/color_provider.h"
 #include "ui/color/color_recipe.h"
 
-namespace {
-
-constexpr float kMinOmniboxToolbarContrast = 1.3f;
-
-ui::ColorTransform ChooseOmniboxBgBlendTarget() {
-  return base::BindRepeating(
-      [](SkColor input_color, const ui::ColorMixer& mixer) {
-        const SkColor toolbar_color = mixer.GetResultColor(kColorToolbar);
-        const SkColor endpoint_color =
-            color_utils::GetEndpointColorWithMinContrast(toolbar_color);
-        return (color_utils::GetContrastRatio(toolbar_color, endpoint_color) >=
-                kMinOmniboxToolbarContrast)
-                   ? endpoint_color
-                   : color_utils::GetColorWithMaxContrast(endpoint_color);
-      });
-}
-
-}  // namespace
-
 void AddChromeColorMixers(ui::ColorProvider* provider) {
   ui::ColorMixer& mixer = provider->AddMixer();
 
   mixer[kColorOmniboxBackground] = ui::BlendForMinContrast(
-      kColorToolbar, kColorToolbar, ChooseOmniboxBgBlendTarget(),
-      kMinOmniboxToolbarContrast);
-  mixer[kColorOmniboxText] =
-      ui::GetColorWithMaxContrast(kColorOmniboxBackground);
+      ui::kColorTextfieldBackground, kColorToolbar, base::nullopt, 1.11f);
+  mixer[kColorOmniboxText] = {ui::kColorTextfieldForeground};
   // TODO(tluk) Behavior change for dark mode to a darker toolbar color for
   // better color semantics. Follow up with UX team before landing change.
   mixer[kColorToolbar] = {ui::kColorPrimaryBackground};