Revert "Windows native color mixer. Not yet instantiated."

This reverts commit 4a3de950.

Reason for revert: Breaks Mac archiver:
FAILED: obj/ui/color/libmixers.a 
rm -f obj/ui/color/libmixers.a && TOOL_VERSION=1571679568 python ../../build/toolchain/mac/filter_libtool.py ../../build/mac_files/xcode_binaries/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/libtool -static  -o obj/ui/color/libmixers.a -filelist obj/ui/color/libmixers.a.rsp
fatal error: ../../build/mac_files/xcode_binaries/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/libtool: file list file: obj/ui/color/libmixers.a.rsp is empty

Original change's description:
> Windows native color mixer.  Not yet instantiated.
> 
> Bug: 1003612
> Change-Id: I4df6d0fe38efaa706e981a7dedcc19355c21fc34
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1900656
> Commit-Queue: Robert Liao <robliao@chromium.org>
> Reviewed-by: Robert Liao <robliao@chromium.org>
> Auto-Submit: Peter Kasting <pkasting@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#713065}

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

Change-Id: I53aeafd8ba06f47522bb82ba3acecedfca64b7ef
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1003612
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1899900Reviewed-by: Joshua Pawlicki <waffles@chromium.org>
Commit-Queue: Joshua Pawlicki <waffles@chromium.org>
Cr-Commit-Position: refs/heads/master@{#713081}

ui/color/BUILD.gn

@@ -30,29 +30,6 @@ jumbo_component("color") {
   ]
 }
 
-jumbo_component("mixers") {
-  sources = [
-    "color_mixers.h",
-  ]
-
-  defines = [ "IS_COLOR_IMPL" ]
-
-  deps = []
-
-  public_deps = [
-    "//base",
-  ]
-
-  if (is_win) {
-    sources += [ "win/native_color_mixer.cc" ]
-
-    deps += [
-      ":color",
-      "//ui/gfx:color_utils",
-    ]
-  }
-}
-
 test("color_unittests") {
   sources = [
     "color_mixer_unittest.cc",

ui/color/color_id.h

@@ -5,8 +5,6 @@
 #ifndef UI_COLOR_COLOR_ID_H_
 #define UI_COLOR_COLOR_ID_H_
 
-#include "build/build_config.h"
-
 namespace ui {
 
 // ColorId contains identifiers for all input, intermediary, and output colors
@@ -21,40 +19,6 @@ enum ColorIds : ColorId {
   // TODO(pkasting): Define this list.
   kColorX = kUiColorsStart,
 
-#if defined(OS_WIN)
-  // Windows native colors
-  kColorNative3dDkShadow,
-  kColorNative3dLight,
-  kColorNativeActiveBorder,
-  kColorNativeActiveCaption,
-  kColorNativeAppWorkspace,
-  kColorNativeBackground,
-  kColorNativeBtnFace,
-  kColorNativeBtnHighlight,
-  kColorNativeBtnShadow,
-  kColorNativeBtnText,
-  kColorNativeCaptionText,
-  kColorNativeGradientActiveCaption,
-  kColorNativeGradientInactiveCaption,
-  kColorNativeGrayText,
-  kColorNativeHighlight,
-  kColorNativeHighlightText,
-  kColorNativeHotlight,
-  kColorNativeInactiveBorder,
-  kColorNativeInactiveCaption,
-  kColorNativeInactiveCaptionText,
-  kColorNativeInfoBk,
-  kColorNativeInfoText,
-  kColorNativeMenu,
-  kColorNativeMenuBar,
-  kColorNativeMenuHilight,
-  kColorNativeMenuText,
-  kColorNativeScrollbar,
-  kColorNativeWindow,
-  kColorNativeWindowFrame,
-  kColorNativeWindowText,
-#endif  // defined(OS_WIN)
-
   // Embedders must start color IDs from this value.
   kUiColorsEnd,
 
@@ -73,10 +37,7 @@ enum ColorSetIds : ColorSetId {
   kUiColorSetsStart = kUiColorsLast + 1,
 
   // TODO(pkasting): Define this list.
-
-  // A set of color IDs whose values match the native platform as closely as
-  // possible.
-  kColorSetNative = kUiColorSetsStart,
+  kColorSetX = kUiColorSetsStart,
 
   // Embedders must start color set IDs from this value.
   kUiColorSetsEnd,

ui/color/color_mixers.h

-// Copyright 2019 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.
-
-#ifndef UI_COLOR_COLOR_MIXERS_H_
-#define UI_COLOR_COLOR_MIXERS_H_
-
-#include "base/component_export.h"
-
-namespace ui {
-
-class ColorProvider;
-
-// Adds native color mixers to |provider| that provide kColorSetNative, as well
-// as mappings from this set to cross-platform IDs.  This function should be
-// implemented on a per-platform basis in relevant subdirectories.
-void AddNativeColorMixers(ui::ColorProvider* provider);
-
-// TODO(pkasting): Other color mixers, e.g.:
-//   * Chrome default colors
-//   * Native/Chrome priority ordering mixer
-//   * All ui/ control and other colors, created from the above
-
-}  // namespace ui
-
-#endif  // UI_COLOR_COLOR_MIXERS_H_

ui/color/win/native_color_mixer.cc

-// Copyright 2019 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/color/color_mixers.h"
-
-#include <windows.h>
-
-#include "ui/color/color_id.h"
-#include "ui/color/color_mixer.h"
-#include "ui/color/color_provider.h"
-#include "ui/color/color_set.h"
-#include "ui/gfx/color_utils.h"
-
-namespace ui {
-
-void AddMixerForNativeColors(ui::ColorProvider* provider) {
-  // TODO(pkasting): Not clear whether this is really the set of interest.
-  // Maybe there's some way to query colors used by UxTheme.dll, or maybe we
-  // should be hardcoding a list of colors for system light/dark modes based on
-  // reverse-engineering current Windows behavior.  Or maybe the union of all
-  // these.
-#define MAP(chrome, native) {chrome, color_utils::GetSysSkColor(native)}
-  provider->AddMixer()->AddSet(
-      {kColorSetNative,
-       {
-           MAP(kColorNative3dDkShadow, COLOR_3DDKSHADOW),
-           MAP(kColorNative3dLight, COLOR_3DLIGHT),
-           MAP(kColorNativeActiveBorder, COLOR_ACTIVEBORDER),
-           MAP(kColorNativeActiveCaption, COLOR_ACTIVECAPTION),
-           MAP(kColorNativeAppWorkspace, COLOR_APPWORKSPACE),
-           MAP(kColorNativeBackground, COLOR_BACKGROUND),
-           MAP(kColorNativeBtnFace, COLOR_BTNFACE),
-           MAP(kColorNativeBtnHighlight, COLOR_BTNHIGHLIGHT),
-           MAP(kColorNativeBtnShadow, COLOR_BTNSHADOW),
-           MAP(kColorNativeBtnText, COLOR_BTNTEXT),
-           MAP(kColorNativeCaptionText, COLOR_CAPTIONTEXT),
-           MAP(kColorNativeGradientActiveCaption, COLOR_GRADIENTACTIVECAPTION),
-           MAP(kColorNativeGradientInactiveCaption,
-               COLOR_GRADIENTINACTIVECAPTION),
-           MAP(kColorNativeGrayText, COLOR_GRAYTEXT),
-           MAP(kColorNativeHighlight, COLOR_HIGHLIGHT),
-           MAP(kColorNativeHighlightText, COLOR_HIGHLIGHTTEXT),
-           MAP(kColorNativeHotlight, COLOR_HOTLIGHT),
-           MAP(kColorNativeInactiveBorder, COLOR_INACTIVEBORDER),
-           MAP(kColorNativeInactiveCaption, COLOR_INACTIVECAPTION),
-           MAP(kColorNativeInactiveCaptionText, COLOR_INACTIVECAPTIONTEXT),
-           MAP(kColorNativeInfoBk, COLOR_INFOBK),
-           MAP(kColorNativeInfoText, COLOR_INFOTEXT),
-           MAP(kColorNativeMenu, COLOR_MENU),
-           MAP(kColorNativeMenuBar, COLOR_MENUBAR),
-           MAP(kColorNativeMenuHilight, COLOR_MENUHILIGHT),
-           MAP(kColorNativeMenuText, COLOR_MENUTEXT),
-           MAP(kColorNativeScrollbar, COLOR_SCROLLBAR),
-           MAP(kColorNativeWindow, COLOR_WINDOW),
-           MAP(kColorNativeWindowFrame, COLOR_WINDOWFRAME),
-           MAP(kColorNativeWindowText, COLOR_WINDOWTEXT),
-       }});
-}
-
-void AddMixerToMapToCrossPlatformIds(ui::ColorProvider* provider) {
-  // TODO(pkasting): Add recipes
-}
-
-void AddNativeColorMixers(ui::ColorProvider* provider) {
-  AddMixerForNativeColors(provider);
-  AddMixerToMapToCrossPlatformIds(provider);
-}
-
-}  // namespace ui